Fixed left over merge conflict marker.
fixed error in turn