Fixed merge conflict marker.