Fixing merge conflicts

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

-- HR LI parameters

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

N9HRMessageCause ::= ENUMERATED

    gPSI                            [4] GPSI OPTIONAL,

    gUTI                            [5] FiveGGUTI OPTIONAL,

    location                        [6] Location,

    sMSOverNASIndicator         [7] SMSOverNASIndicator OPTIONAL,

    oldGUTI                     [8] EPS5GGUTI OPTIONAL,

    deprecatedSMSOverNASIndicator   [7] SMSOverNASIndicator OPTIONAL,

    deprecatedOldGUTI               [8] EPS5GGUTI OPTIONAL

    uEAreaIndication                [9] UEAreaIndication OPTIONAL

}

    trafficRoutes                 [8] RouteToLocationSet,

    trafficSteeringPolIdDl        [9] UTF8String OPTIONAL,

    trafficSteeringPolIdUl        [10] UTF8String OPTIONAL,

    sourceDNAI                    [11] DNAI OPTIONAL,

    targetDNAI                    [12] DNAI OPTIONAL,

    dNAIChangeType                [13] DNAIChangeType OPTIONAL,

    sourceUEIPAddr                [14] IPAddress OPTIONAL,

    targetUEIPAddr                [15] IPAddress OPTIONAL,

    deprecatedSourceDNAI          [11] DNAI OPTIONAL,

    deprecatedTargetDNAI          [12] DNAI OPTIONAL,

    deprecatedDNAIChangeType      [13] DNAIChangeType OPTIONAL,

    deprecatedSourceUEIPAddr      [14] IPAddress OPTIONAL,

    deprecatedTargetUEIPAddr      [15] IPAddress OPTIONAL,

    sourceTrafficRouting          [16] RouteToLocation OPTIONAL,

    targetTrafficRouting          [17] RouteToLocation OPTIONAL,

    eASIPReplaceInfos             [18] EASIPReplaceInfos OPTIONAL

    requestUnsuccessful(1),

    requestUnknown(2)

}

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

-- IMS definitions

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

    accessNetworkInformation   [7] SEQUENCE OF SIPAccessNetworkInformation OPTIONAL,

    cellularNetworkInformation [8] SEQUENCE OF SIPCellularNetworkInformation OPTIONAL

}

-- See clause 7.12.4.2.2 for details of this structure

StartOfInterceptionForActiveIMSSession ::= SEQUENCE

{

LALSReport ::= SEQUENCE

{

    sUPI                [1] SUPI OPTIONAL,

--  pEI                 [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number

    -- deprecatedPEI was deprecated in r16(16) version6(6).

    deprecatedPEI       [2] PEI OPTIONAL,

    gPSI                [3] GPSI OPTIONAL,

    location            [4] Location OPTIONAL,

    iMPU                [5] IMPU OPTIONAL,

-- Identifier Association parameters

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

MMEGroupID ::= OCTET STRING (SIZE(2))

MMECode ::= OCTET STRING (SIZE(1))

-- 5G EPS Interworking Parameters

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

EMM5GMMStatus ::= SEQUENCE

{

    eMMRegStatus  [1] EMMRegStatus OPTIONAL,

    protectionSchemeID          [4] ProtectionSchemeID,

    homeNetworkPublicKeyID      [5] HomeNetworkPublicKeyID,

    schemeOutput                [6] SchemeOutput,

    -- shall be included if different from the number of meaningful digits given

    -- in routingIndicator

    routingIndicatorLength      [7] INTEGER (1..4) OPTIONAL,

    -- routingIndicatorLength shall be included if different from the number

    -- of meaningful digits given in routingIndicator.

    routingIndicatorLength      [7] INTEGER (1..4) OPTIONAL

    sUPIType                    [8] SUPIType OPTIONAL,

    homeNetworkIdentifier       [9] HomeNetworkIdentifier OPTIONAL

}

    ageOfLocationInformation [8] INTEGER OPTIONAL,

    userCSGInformation       [9] UserCSGInformation OPTIONAL

}

-- TS 29.172 [53], clause 7.4.57

ESMLCCellInfo ::= SEQUENCE

{

PointUncertaintyCircle ::= SEQUENCE

{

    geographicalCoordinates             [1] GeographicalCoordinates,

-- The uncertainty parameter has been deprecated and shall be set to 0.

-- The uncertaintySBI parameter shall be used instead.

    uncertainty                         [2] Uncertainty,

    -- deprecatedUncertainty was deprecated in r18(18) version3(3)

    -- and shall be set to 0. The uncertaintySBI parameter shall be used instead.

    deprecatedUncertainty               [2] Uncertainty,

    uncertaintySBI                      [3] UncertaintySBI OPTIONAL

}

    point                               [1] GeographicalCoordinates,

    altitude                            [2] Altitude,

    uncertaintyEllipse                  [3] UncertaintyEllipse,

-- The uncertaintyAltitude parameter has been deprecated and shall be set to 0.

-- The uncertaintyAltitudeSBI parameter shall be used instead.

    uncertaintyAltitude                 [4] Uncertainty,

    -- deprecatedUncertaintyAltitude was deprecated in r18(18) version3(3)

    -- and shall be set to 0. The uncertaintyAltitudeSBI parameter shall be used instead.

    deprecatedUncertaintyAltitude       [4] Uncertainty,

    confidence                          [5] Confidence,

    uncertaintyAltitudeSBI              [6] UncertaintySBI OPTIONAL

}

{

    point                               [1] GeographicalCoordinates,

    innerRadius                         [2] InnerRadius,

-- The uncertaintyRadius parameter has been deprecated and shall be set to 0.

-- The uncertaintyRadiusSBI parameter shall be used instead.

    uncertaintyRadius                   [3] Uncertainty,

    -- deprecatedUncertaintyRadius was deprecated in r18(18) version3(3)

    -- and shall be set to 0. The uncertaintyRadiusSBI parameter shall be used instead.

    deprecatedUncertaintyRadius         [3] Uncertainty,

    offsetAngle                         [4] Angle,

    includedAngle                       [5] Angle,

    confidence                          [6] Confidence,

-- TS 29.572 [24], clause 6.1.6.2.22

UncertaintyEllipse ::= SEQUENCE

{

-- The semiMajor parameter has been deprecated and shall be set to 0.

-- The semiMajorSBI parameter shall be used instead.

    semiMajor                           [1] Uncertainty,

-- The semiMinor parameter has been deprecated and shall be set to 0.

-- The semiMinorSBI parameter shall be used instead.

    semiMinor                           [2] Uncertainty,

    -- deprecatedSemiMajor was deprecated in r18(18) version3(3)

    -- and shall be set to 0. The semiMajorSBI parameter shall be used instead.

    deprecatedSemiMajor                 [1] Uncertainty,

    -- deprecatedSemiMinor was deprecated in r18(18) version3(3)

    -- and shall be set to 0. The semiMinorSBI parameter shall be used instead.

    deprecatedSemiMinor                 [2] Uncertainty,

    orientationMajor                    [3] Orientation,

    semiMajorSBI                        [4] UncertaintySBI OPTIONAL,

    semiMinorSBI                        [5] UncertaintySBI OPTIONAL

}

-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1

Altitude ::= UTF8String

Angle ::= INTEGER (0..360)

UncertaintySBI ::= UTF8String

VerticalSpeed ::= UTF8String

SpeedUncertainty ::= UTF8String

BarometricPressure ::= INTEGER (30000..115000)

Uncertainty ::= INTEGER (0..127)

-- TS 29.572 [24], clause 6.1.6.3.13