Technically KeePass can “merge” and has some sort of conflict resolution, but you’re right that forgotten and unaddressed conflicts can lay around for unlimited time without you noticing. It’s the main problem with keepass + syncthing.