Removing conflicted copies