creating a merge conflict
conflict resolved