practicing merge conflict resolution