i

# Conflicts:
#	datafusion/core/tests/sqllogictests/test_files/aggregate.slt

# Conflicts:
#	datafusion/core/src/physical_plan/planner.rs
#	datafusion/core/tests/sqllogictests/test_files/aggregate.slt
#	datafusion/expr/src/expr.rs
#	datafusion/expr/src/tree_node/expr.rs
#	datafusion/expr/src/udaf.rs
#	datafusion/optimizer/src/analyzer/type_coercion.rs
#	datafusion/optimizer/src/common_subexpr_eliminate.rs
#	datafusion/proto/src/logical_plan/from_proto.rs
#	datafusion/proto/src/logical_plan/mod.rs
#	datafusion/proto/src/logical_plan/to_proto.rs
#	datafusion/sql/src/expr/function.rs
#	datafusion/sql/src/utils.rs

…rst_last_aggregate

# Conflicts:
#	datafusion/expr/Cargo.toml

# Conflicts:
#	datafusion/core/tests/sql/group_by.rs

…rst_last_aggregate

# Conflicts:
#	datafusion/expr/src/tree_node/expr.rs

# Conflicts:
#	datafusion/core/src/physical_plan/aggregates/mod.rs
#	datafusion/core/tests/sqllogictests/test_files/groupby.slt
#	datafusion/proto/proto/datafusion.proto
#	datafusion/proto/src/generated/pbjson.rs
#	datafusion/proto/src/generated/prost.rs
#	datafusion/sql/src/expr/mod.rs

# Conflicts:
#	datafusion-cli/Cargo.lock
#	datafusion/expr/Cargo.toml

…conversion

…conversion

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

# Conflicts:
#	datafusion-cli/Cargo.lock
#	datafusion/common/Cargo.toml
#	datafusion/core/Cargo.toml
#	datafusion/expr/Cargo.toml
#	datafusion/sql/Cargo.toml

…conversion

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

…conversion

# Conflicts:
#	datafusion/core/src/physical_plan/aggregates/mod.rs

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

…conversion

# Conflicts:
#	datafusion/core/src/physical_plan/aggregates/mod.rs
#	datafusion/core/tests/sqllogictests/test_files/groupby.slt

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

…conversion

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

# Conflicts:
#	datafusion/core/src/physical_plan/aggregates/mod.rs
#	datafusion/core/tests/sqllogictests/test_files/groupby.slt
#	datafusion/core/tests/sqllogictests/test_files/window.slt
#	datafusion/expr/src/aggregate_function.rs
#	datafusion/expr/src/window_function.rs
#	datafusion/physical-expr/src/lib.rs

…ention.

# Conflicts:
#	datafusion/physical-expr/src/lib.rs
#	datafusion/physical-expr/src/sort_expr.rs

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.