cannot drop intarray extension

Applying: trying to resolve drop extension deletion order
Using index info to reconstruct a base tree...
M	src/backend/catalog/dependency.c
M	src/backend/catalog/pg_shdepend.c
M	src/backend/commands/dropcmds.c
M	src/backend/commands/indexcmds.c
M	src/backend/commands/tablecmds.c
M	src/include/catalog/dependency.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/dependency.h
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Auto-merging src/backend/commands/indexcmds.c
Auto-merging src/backend/commands/dropcmds.c
Auto-merging src/backend/catalog/pg_shdepend.c
Auto-merging src/backend/catalog/dependency.c
Patch failed at 0001 trying to resolve drop extension deletion order

/ci/repo/worktrees/worktree/rebase-apply/patch:65: trailing whitespace.
		/* 
warning: 1 line adds whitespace errors.
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"