delete conflict files