delete conflict part