Removed conflict marker.