Remove leftover merge conflict strings