Flush pgstats file during checkpoints

Applying: Flush pgstats file during checkpoints
Using index info to reconstruct a base tree...
M	src/backend/access/transam/xlog.c
M	src/backend/utils/activity/pgstat.c
M	src/include/pgstat.h
A	src/test/modules/injection_points/t/001_stats.pl
M	src/test/recovery/t/029_stats_restart.pl
M	src/test/recovery/t/030_stats_cleanup_replica.pl
Falling back to patching base and 3-way merge...
Auto-merging src/test/recovery/t/030_stats_cleanup_replica.pl
Auto-merging src/test/recovery/t/029_stats_restart.pl
CONFLICT (modify/delete): src/test/modules/injection_points/t/001_stats.pl deleted in HEAD and modified in Flush pgstats file during checkpoints. Version Flush pgstats file during checkpoints of src/test/modules/injection_points/t/001_stats.pl left in tree.
Auto-merging src/include/pgstat.h
CONFLICT (content): Merge conflict in src/include/pgstat.h
Auto-merging src/backend/utils/activity/pgstat.c
CONFLICT (content): Merge conflict in src/backend/utils/activity/pgstat.c
Auto-merging src/backend/access/transam/xlog.c
CONFLICT (content): Merge conflict in src/backend/access/transam/xlog.c
Patch failed at 0001 Flush pgstats file during checkpoints

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"