delete conflict code