Cache relation sizes?

Applying: WIP: Track relation sizes in shared memory.
Using index info to reconstruct a base tree...
M	contrib/pg_visibility/pg_visibility.c
M	src/backend/access/heap/visibilitymap.c
M	src/backend/catalog/storage.c
M	src/backend/commands/dbcommands.c
M	src/backend/storage/buffer/bufmgr.c
M	src/backend/storage/freespace/freespace.c
M	src/backend/storage/ipc/ipci.c
M	src/backend/storage/smgr/md.c
M	src/backend/storage/smgr/smgr.c
M	src/backend/utils/activity/wait_event.c
M	src/backend/utils/misc/guc.c
M	src/include/storage/smgr.h
M	src/include/utils/wait_event.h
Falling back to patching base and 3-way merge...
Auto-merging src/include/utils/wait_event.h
CONFLICT (content): Merge conflict in src/include/utils/wait_event.h
Auto-merging src/include/storage/smgr.h
CONFLICT (content): Merge conflict in src/include/storage/smgr.h
Auto-merging src/backend/utils/misc/guc.c
CONFLICT (content): Merge conflict in src/backend/utils/misc/guc.c
Auto-merging src/backend/utils/activity/wait_event.c
CONFLICT (content): Merge conflict in src/backend/utils/activity/wait_event.c
Auto-merging src/backend/storage/smgr/smgr.c
CONFLICT (content): Merge conflict in src/backend/storage/smgr/smgr.c
Auto-merging src/backend/storage/smgr/md.c
CONFLICT (content): Merge conflict in src/backend/storage/smgr/md.c
Auto-merging src/backend/storage/ipc/ipci.c
CONFLICT (content): Merge conflict in src/backend/storage/ipc/ipci.c
Auto-merging src/backend/storage/freespace/freespace.c
CONFLICT (content): Merge conflict in src/backend/storage/freespace/freespace.c
Auto-merging src/backend/storage/buffer/bufmgr.c
CONFLICT (content): Merge conflict in src/backend/storage/buffer/bufmgr.c
Auto-merging src/backend/commands/dbcommands.c
Auto-merging src/backend/catalog/storage.c
CONFLICT (content): Merge conflict in src/backend/catalog/storage.c
Auto-merging src/backend/access/heap/visibilitymap.c
CONFLICT (content): Merge conflict in src/backend/access/heap/visibilitymap.c
Auto-merging contrib/pg_visibility/pg_visibility.c
CONFLICT (content): Merge conflict in contrib/pg_visibility/pg_visibility.c
Patch failed at 0001 WIP: Track relation sizes in shared memory.

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"