Right now your account does a snapshot backup and restore: the most recent upload wins, so editing on two phones at once can overwrite one side. True two-way merge is a much bigger build. Vote if you actually use two devices (phone + a second phone, or a family member's), and tell us which two in the comments.