Remove conflicted file