fix conflicted copies