     case lyric = 0x05
     case marker = 0x06
     case cuePoint = 0x07
-<<<<<<< Updated upstream
     case devicePortName = 0x09
-=======
     case programName = 0x08
     case devicePortName = 0x09
     case metaEvent10 = 0x0A
     case metaEvent12 = 0x0C
->>>>>>> Stashed changes
     case channelPrefix = 0x20
     case midiPort = 0x21
     case endOfTrack = 0x2F

            return "Marker"
        case .cuePoint:
            return "Cue Point"
<<<<<<< Updated upstream
        case .devicePortName:
            return "Device (Port) Name"
=======
        case .programName:
            return "Program Name"
        case .devicePortName:

            return "Meta Event 10"
        case .metaEvent12:
            return "Meta Event 12"
        case .channelPrefix:
            return "Channel Prefix"
        case .midiPort:
