Create a merge conflict
Fix merge conflict