fix merge conflict markers.

There is a conflict that was pushed and left unresolved. fix that.