Remove conflict lines

This PR removes some conflict messages. 

As requested on #184, I'm updating the commit message.