Fixing merge conflicts

    mUSIMUERequestType              [26] MUSIMUERequestType OPTIONAL,

    unavailabilityPeriodDuration    [27] UnavailabilityPeriodDuration OPTIONAL,

    fiveGSUpdateType                [28] FiveGSUpdateType OPTIONAL,

    uEAreaIndication                [29] UEAreaIndication OPTIONAL

    uEAreaIndication                [29] UEAreaIndication OPTIONAL,

    establishmentCauseNon3GPPAccess [30] EstablishmentCauseNon3GPPAccess OPTIONAL

}

-- See clause 6.2.2.2.3 for details of this structure

    tAIBased          [4] SEQUENCE (SIZE(1..MAX)) OF TAI

}

-- TS 24.502 clause 9.2.2, omitting the first octet

EstablishmentCauseNon3GPPAccess ::= OCTET STRING

MDTActivation ::= ENUMERATED

{

    immediateMDTOnly(1),

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

ExternalASNType ::= SEQUENCE

{

<<<<<<< HEAD

    moduleIdentifier [1] OBJECT IDENTIFIER,

=======

    moduleIdentifier [1] OBJECT IDENTIFIER OPTIONAL,

>>>>>>> cr/33128/0576

    aSNReference     [2] ExternalASNReference OPTIONAL,

    encodedASNValue  [3] ExternalASNValue

}