Resolve conflicts

docker-compose/docker-compose-basic-vpp-nrf.yaml

@@ -165,7 +165,7 @@ services:
             - PLMN_SUPPORT_TAC=0xa000
             - SST_0=222
             - SD_0=123
-            - SST_1=1
+            - SST_1=128
             - SD_1=12
             - AMF_INTERFACE_NAME_FOR_NGAP=eth0
             - AMF_INTERFACE_NAME_FOR_N11=eth0

docker-compose/docker-compose-ueransim-vpp.yaml

@@ -29,10 +29,10 @@ services:
             - GNB_IP_ADDRESS=192.168.70.141
             - PDU_TYPE=IPv4
             - APN=default
-            - SST_C=1
-            - SD_C=1
-            - SST_D=1
-            - SD_D=1
+            - SST_C=222
+            - SD_C=123
+            - SST_D=222
+            - SD_D=123
         networks:
             public_net:
                 ipv4_address: 192.168.70.141