remove conflict text
:)