Remove merge conflict messages