Removed conflicted copies