Remove a conflicted file.