undoes that last change, it creates a merge conflict