Remove a conflicted file version