Fix a merge conflict marker that somehow got left in master