Even merge conflicts have been a lot better for me in recent years. My only worry with KeePass is that I have to rely on potentially sketchy client applications but I'm also fortunate enough to have the skills to make my own if I really felt the need. It's one of the few "not-my-solution" pieces of software which continually gives me a sense of data ownership.