Possible spelling fixes

Applying: spelling: comments
Using index info to reconstruct a base tree...
M	contrib/pgcrypto/crypt-des.c
A	contrib/spi/timetravel.c
M	src/backend/access/transam/twophase.c
M	src/backend/commands/copy.c
M	src/backend/commands/tablecmds.c
M	src/backend/foreign/foreign.c
M	src/backend/optimizer/plan/createplan.c
M	src/backend/parser/parse_collate.c
M	src/backend/parser/parse_param.c
M	src/backend/regex/regc_pg_locale.c
M	src/backend/storage/ipc/procarray.c
M	src/backend/storage/lmgr/lock.c
M	src/backend/tsearch/dict_thesaurus.c
M	src/backend/utils/adt/selfuncs.c
M	src/backend/utils/cache/lsyscache.c
M	src/backend/utils/cache/plancache.c
M	src/backend/utils/error/elog.c
M	src/backend/utils/fmgr/fmgr.c
M	src/backend/utils/hash/dynahash.c
M	src/backend/utils/misc/README
M	src/bin/pg_dump/parallel.c
M	src/fe_utils/string_utils.c
A	src/include/utils/jsonapi.h
M	src/interfaces/libpq/fe-connect.c
M	src/interfaces/libpq/fe-exec.c
M	src/pl/plperl/ppport.h
M	src/pl/plpgsql/src/pl_exec.c
M	src/pl/plpython/plpy_procedure.c
M	src/pl/plpython/plpy_typeio.c
M	src/test/regress/sql/errors.sql
M	src/test/regress/sql/groupingsets.sql
Falling back to patching base and 3-way merge...
Auto-merging src/test/regress/sql/groupingsets.sql
Auto-merging src/test/regress/sql/errors.sql
Auto-merging src/pl/plpython/plpy_typeio.c
CONFLICT (content): Merge conflict in src/pl/plpython/plpy_typeio.c
Auto-merging src/pl/plpython/plpy_procedure.c
CONFLICT (content): Merge conflict in src/pl/plpython/plpy_procedure.c
Auto-merging src/pl/plpgsql/src/pl_exec.c
CONFLICT (content): Merge conflict in src/pl/plpgsql/src/pl_exec.c
Auto-merging src/pl/plperl/ppport.h
Auto-merging src/interfaces/libpq/fe-exec.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-exec.c
Auto-merging src/interfaces/libpq/fe-connect.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-connect.c
CONFLICT (modify/delete): src/include/utils/jsonapi.h deleted in HEAD and modified in spelling: comments. Version spelling: comments of src/include/utils/jsonapi.h left in tree.
Auto-merging src/fe_utils/string_utils.c
Auto-merging src/bin/pg_dump/parallel.c
CONFLICT (content): Merge conflict in src/bin/pg_dump/parallel.c
Auto-merging src/backend/utils/misc/README
Auto-merging src/backend/utils/hash/dynahash.c
Auto-merging src/backend/utils/fmgr/fmgr.c
Auto-merging src/backend/utils/error/elog.c
CONFLICT (content): Merge conflict in src/backend/utils/error/elog.c
Auto-merging src/backend/utils/cache/plancache.c
Auto-merging src/backend/utils/cache/lsyscache.c
Auto-merging src/backend/utils/adt/selfuncs.c
Auto-merging src/backend/tsearch/dict_thesaurus.c
Auto-merging src/backend/storage/lmgr/lock.c
Auto-merging src/backend/storage/ipc/procarray.c
CONFLICT (content): Merge conflict in src/backend/storage/ipc/procarray.c
Auto-merging src/backend/regex/regc_pg_locale.c
Auto-merging src/backend/parser/parse_param.c
Auto-merging src/backend/parser/parse_collate.c
Auto-merging src/backend/optimizer/plan/createplan.c
Auto-merging src/backend/foreign/foreign.c
Auto-merging src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/copy.c
CONFLICT (content): Merge conflict in src/backend/commands/copy.c
Auto-merging src/backend/access/transam/twophase.c
CONFLICT (modify/delete): contrib/spi/timetravel.c deleted in HEAD and modified in spelling: comments. Version spelling: comments of contrib/spi/timetravel.c left in tree.
Auto-merging contrib/pgcrypto/crypt-des.c
Patch failed at 0001 spelling: comments

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"