delete conflict

ed