Removed leftover from git conflict marker.