4 ms·Keepass will let you merge the databases if a conflict happens.by Nullabillity 10y agoKeepass will let you merge the databases if a conflict happens.