Corrected merge conflict I missed earlier
Corrected merge conflict I missed earlier

krevis/MIDIApps,krevis/MIDIApps,krevis/MIDIApps,DouglasHeriot/MIDIApps,krevis/MIDIApps,DouglasHeriot/MIDIApps,DouglasHeriot/MIDIApps,krevis/MIDIApps