plan shape work

Applying: Add a list of all PlannerInfo "roots" to PlannerGlobal.
Using index info to reconstruct a base tree...
M	src/backend/optimizer/plan/planagg.c
M	src/backend/optimizer/plan/planner.c
M	src/backend/optimizer/prep/prepjointree.c
M	src/include/nodes/pathnodes.h
M	src/include/optimizer/planner.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/optimizer/planner.h
Auto-merging src/include/nodes/pathnodes.h
Auto-merging src/backend/optimizer/prep/prepjointree.c
Auto-merging src/backend/optimizer/plan/planner.c
Auto-merging src/backend/optimizer/plan/planagg.c
CONFLICT (content): Merge conflict in src/backend/optimizer/plan/planagg.c
Patch failed at 0001 Add a list of all PlannerInfo "roots" to PlannerGlobal.

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"