Resolving merge conflict

    ePSPDNConnectionEstablishment [27] EPSPDNConnectionEstablishment OPTIONAL,

    satelliteBackhaulCategory     [28] SBIType OPTIONAL,

    gEOSatelliteID                [29] GEOSatelliteID OPTIONAL,

    alternativeNSSAI              [30] AlternativeNSSAIList OPTIONAL

    alternativeNSSAI              [30] AlternativeNSSAIList OPTIONAL,

    aNDSPRules                    [31] ANDSPRules OPTIONAL

}

-- See clause 6.2.3.2.3 for details of this structure

    satelliteBackhaulCategory   [21] SBIType OPTIONAL,

    gEOSatelliteID              [22] GEOSatelliteID OPTIONAL,

    proSeRemoteUEsReport        [23] ProSeRemoteUEsReport OPTIONAL,

    alternativeNSSAI            [24] AlternativeNSSAIList OPTIONAL

    alternativeNSSAI            [24] AlternativeNSSAIList OPTIONAL,

    aNDSPRules                  [25] ANDSPRules OPTIONAL

}

-- See clause 6.2.3.2.4 for details of this structure

    portEnd   [2] INTEGER (0..65535)

}

ANDSPRules ::= SEQUENCE (SIZE(1..MAX)) OF ANDSPRule

-- see clause 6.2.3.2.2 for details.

ANDSPRule ::= CHOICE

{

    wLANSP                     [1] OCTET STRING,

    n3ANNodeConfiguration      [2] OCTET STRING

}

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

-- PGW-C + SMF PDNConnection Events

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