merge conflict resolution++