[mixedCase]

I did not, I wasn't aware of keepass-diff and certainly it would've been able to solve the problem. But to tell you the truth I don't think I would use it. This is something that I really don't want to have to worry about regardless of what device I'm using.

[Narigo]

Thanks for the insight! I guess it's a hard problem to solve with these conflicts. I'm wondering how it could be automatically resolved if a user has the same thing open multiple times with changes to the same password...