Expression based aggregate transition / combine function invocation

Applying: Expression evaluatation based agg transition invocation.
Using index info to reconstruct a base tree...
M	src/backend/executor/execExpr.c
M	src/backend/executor/execExprInterp.c
M	src/backend/executor/nodeAgg.c
M	src/include/executor/execExpr.h
M	src/include/executor/executor.h
M	src/include/executor/nodeAgg.h
M	src/include/nodes/execnodes.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/nodes/execnodes.h
CONFLICT (content): Merge conflict in src/include/nodes/execnodes.h
Auto-merging src/include/executor/nodeAgg.h
CONFLICT (content): Merge conflict in src/include/executor/nodeAgg.h
Auto-merging src/include/executor/executor.h
CONFLICT (content): Merge conflict in src/include/executor/executor.h
Auto-merging src/include/executor/execExpr.h
CONFLICT (content): Merge conflict in src/include/executor/execExpr.h
Auto-merging src/backend/executor/nodeAgg.c
CONFLICT (content): Merge conflict in src/backend/executor/nodeAgg.c
Auto-merging src/backend/executor/execExprInterp.c
CONFLICT (content): Merge conflict in src/backend/executor/execExprInterp.c
Auto-merging src/backend/executor/execExpr.c
CONFLICT (content): Merge conflict in src/backend/executor/execExpr.c
Patch failed at 0001 Expression evaluatation based agg transition invocation.

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"