removed conflicted copies