Plain Diff
# Conflicts: # src/execution/execution_sort.h # src/optimizer/plan.h # src/optimizer/planner.cpp # src/portal.h