         fmMixKnob.value = conductor.core.fmOscMix
         
         fmModKnob.maximum = 15
-<<<<<<< HEAD
-        fmModKnob.value = conductor.core.fmMod
-        
-        pwmKnob.minimum = 0.5
-        pwmKnob.value = conductor.core.pulseWidth
-        
-        noiseMixKnob.value = conductor.core.noiseMix
-        
-        oscMixKnob.value = conductor.core.vco12Mix
-        
-        lfoAmtKnob.maximum = 2000
-=======
 
         pwmKnob.value = conductor.core.morph
         pwmKnob.minimum = -0.99

    }
    
    // Universal
    
    @IBAction func midiPanicPressed(sender: RoundedButton) {
        statusLabel.text = "All Notes Off"
        conductor.core.panic()

            conductor.core.detune = value
            
        case ControlTag.OscMix.rawValue:
            statusLabel.text = "OscMix: \(value.decimalString)"
            conductor.core.vcoBalance = value
            
        case ControlTag.Pwm.rawValue:
            statusLabel.text = "Morph: \(value.decimalString)"
            conductor.core.morph = value
            
        // Additional OSCs
        case ControlTag.SubMix.rawValue:
