Delete conflict file