Merge conflicts are a concern for KeePass
It's really not that much of an issue. I sync my database between several devices, some of which are only used occasionally. Rarely do I ever have a merge conflict.
If you're editing the database on multiple devices before they have a chance to sync with each other, maybe stop doing that. That's what causes merge issues.