Make the transition state of avg(int2)/avg(int4)/sum(int2)/sum(int4) internal

Applying: Make the transition state of avg(int2)/avg(int4)/sum(int2)/sum(int4) internal
Using index info to reconstruct a base tree...
M	src/include/catalog/catversion.h
M	src/include/catalog/pg_proc.dat
Falling back to patching base and 3-way merge...
Auto-merging src/include/catalog/pg_proc.dat
Auto-merging src/include/catalog/catversion.h
CONFLICT (content): Merge conflict in src/include/catalog/catversion.h
Patch failed at 0001 Make the transition state of avg(int2)/avg(int4)/sum(int2)/sum(int4) internal

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"