fixed conflict marker

I found conflict marker.
I removed it.