delete conflict file