Remove conflict file