Remove merge conflict messages.