End your conflicted copies!