Remove merge conflict files