delete conflict junk