removing conflicted copies