# Conflicts:
#       cmd/explaintest/r/explain_easy.result
#       executor/aggfuncs/aggfunc_test.go
#       executor/aggfuncs/window_func_test.go
#       executor/benchmark_test.go
#       executor/builder.go
#       expression/aggregation/agg_to_pb_test.go
#       expression/aggregation/base_func.go
#       expression/aggregation/base_func_test.go
#       expression/aggregation/descriptor.go
#       expression/aggregation/window_func.go
#       planner/core/expression_rewriter.go
#       planner/core/logical_plan_builder.go
#       planner/core/rule_aggregation_push_down.go
#       planner/core/rule_inject_extra_projection_test.go