Removed a conflicted file