is this a merge conflict marker?