rm merge conflict symbol