Deadlock between logrep apply worker and tablesync worker

Applying: Avoid dropping origins from both apply and tablesync worker
Using index info to reconstruct a base tree...
M	doc/src/sgml/catalogs.sgml
M	src/backend/commands/subscriptioncmds.c
M	src/backend/replication/logical/tablesync.c
M	src/backend/replication/logical/worker.c
M	src/include/catalog/pg_subscription_rel.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/pg_subscription_rel.h
Auto-merging src/backend/replication/logical/worker.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/worker.c
Auto-merging src/backend/replication/logical/tablesync.c
CONFLICT (content): Merge conflict in src/backend/replication/logical/tablesync.c
Auto-merging src/backend/commands/subscriptioncmds.c
CONFLICT (content): Merge conflict in src/backend/commands/subscriptioncmds.c
Auto-merging doc/src/sgml/catalogs.sgml
CONFLICT (content): Merge conflict in doc/src/sgml/catalogs.sgml
Patch failed at 0001 Avoid dropping origins from both apply and tablesync worker

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"