Bypassing cursors in postgres_fdw to enable parallel plans

Applying: postgres_fdw: Add streaming_fetch option for cursor-free fetching
Using index info to reconstruct a base tree...
M	contrib/postgres_fdw/connection.c
M	contrib/postgres_fdw/expected/postgres_fdw.out
M	contrib/postgres_fdw/option.c
M	contrib/postgres_fdw/postgres_fdw.c
M	contrib/postgres_fdw/sql/postgres_fdw.sql
M	doc/src/sgml/postgres-fdw.sgml
Falling back to patching base and 3-way merge...
Auto-merging doc/src/sgml/postgres-fdw.sgml
Auto-merging contrib/postgres_fdw/sql/postgres_fdw.sql
Auto-merging contrib/postgres_fdw/postgres_fdw.c
Auto-merging contrib/postgres_fdw/option.c
CONFLICT (content): Merge conflict in contrib/postgres_fdw/option.c
Auto-merging contrib/postgres_fdw/expected/postgres_fdw.out
Auto-merging contrib/postgres_fdw/connection.c
Patch failed at 0001 postgres_fdw: Add streaming_fetch option for cursor-free fetching

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"