Fixed left over merge conflict marker.