Delete the conflict 2