Resolving merge conflicts

    -- Tag 16 is reserved because there is no equivalent mDFCellSiteReport in XIRIEvent.

    -- MMS events, see clause 7.4.3

    -- MMS events, see clause 7.4.3 see also MMSConverted events ([162-163] below)

    mMSSend                                             [17] MMSSend,

    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,

    mMSNotification                                     [19] MMSNotification,

    -- IMS HSS events, see clause 7.2.4.3

    iMSHSSServingSystemMessage                          [170] IMSHSSServingSystemMessage,

    iMSHSSStartOfInterceptionWithRegisteredTarget       [171] IMSHSSStartOfInterceptionWithRegisteredTarget,

    iMSHSSSubscriberRecordChange                        [172] IMSHSSSubscriberRecordChange

    iMSHSSSubscriberRecordChange                        [172] IMSHSSSubscriberRecordChange,

    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [173] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [174] MMSConvertedToEmail

}

-- ==============

    -- MDF events, see clause 7.3.2.2

    mDFCellSiteReport                                   [16] MDFCellSiteReport,

    -- MMS events, see clause 7.4.4.1

    -- MMS events, see clause 7.4.4.1 see also MMSConverted events ([162-163] below)

    mMSSend                                             [17] MMSSend,

    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,

    mMSNotification                                     [19] MMSNotification,

    -- IMS HSS events, see clause 7.2.4.3

    iMSHSSServingSystemMessage                          [170] IMSHSSServingSystemMessage,

    iMSHSSStartOfInterceptionWithRegisteredTarget       [171] IMSHSSStartOfInterceptionWithRegisteredTarget,

    iMSHSSSubscriberRecordChange                        [172] IMSHSSSubscriberRecordChange

    iMSHSSSubscriberRecordChange                        [172] IMSHSSSubscriberRecordChange,

    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [173] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [174] MMSConvertedToEmail

}

IRITargetIdentifier ::= SEQUENCE

    contentType              [19] UTF8String OPTIONAL

}

MMSConvertedFromEmail ::= SEQUENCE

{

    version             [1]  MMSVersion,

    transactionID       [2]  UTF8String,

    terminatingMMSParty [3]  SEQUENCE OF MMSParty,

    contentType         [4]  MMSContentType,

    originatingMMSParty [5]  MMSParty,

    messageClass        [6]  MMSMessageClass OPTIONAL,

    dateTime            [7]  Timestamp,

    expiry              [8]  MMSExpiry OPTIONAL,

    deliveryReport      [9]  BOOLEAN OPTIONAL,

    priority            [10] MMSPriority OPTIONAL,

    readReport          [11] BOOLEAN OPTIONAL,

    subject             [12] MMSSubject OPTIONAL,

    messageID           [13] UTF8String OPTIONAL

}

MMSConvertedToEmail ::= SEQUENCE

{

    version             [1]  MMSVersion,

    transactionID       [2]  UTF8String,

    terminatingMMSParty [3]  SEQUENCE OF MMSParty,

    contentType         [4]  MMSContentType,

    originatingMMSParty [5]  MMSParty,

    messageClass        [6]  MMSMessageClass OPTIONAL,

    dateTime            [7]  Timestamp,

    expiry              [8]  MMSExpiry OPTIONAL,

    desiredDeliveryTime [9]  Timestamp OPTIONAL,

    deliveryReport      [10] BOOLEAN OPTIONAL,

    priority            [11] MMSPriority OPTIONAL,

    senderVisibility    [12] BOOLEAN OPTIONAL,

    store               [13] BOOLEAN OPTIONAL,

    state               [14] MMState OPTIONAL,

    flags               [15] MMFlags OPTIONAL,

    readReport          [16] BOOLEAN OPTIONAL,

    subject             [17] MMSSubject OPTIONAL,

    messageID           [18] UTF8String OPTIONAL

}

-- =========

-- MMS CCPDU

-- =========