Faulty merges with pacman 7.0 updates

[CubeTheThird]

Having just updated to pacman 7.0, I have had a couple occurrences with merges not being completed correctly. In particular, the files pacman.conf and makepkg.conf, while having been auto merged successfully, had lingering unresolved conflicts to the effect of:

<<<<<<<
#some lines here
==========
#some other lines here
>>>>>>>>

Note this is obviously not a real example. I had to quickly resolve the merges, but I will attempt to get a real sample later.