[CONFLICT] delete conflict