Ticket0637: Manage merge conflicts when changes are made on both sides