attempting a merge conflict