fix conflicted copy