Delete conflict-file