Fix merge error.

cmake_targets/CMakeLists.txt

@@ -3465,6 +3465,7 @@ add_executable(nr-ittisim
   ${OPENAIR_DIR}/common/utils/utils.c
   ${OPENAIR_DIR}/common/utils/system.c
   ${OPENAIR_DIR}/common/utils/nr/nr_common.c
+  ${OPENAIR_DIR}/common/utils/threadPool/thread-pool.c
   ${GTPU_need_ITTI}
   ${XFORMSINTERFACE_SOURCE}
   ${T_SOURCE}

openair2/RRC/NR_UE/rrc_defs.h

@@ -128,12 +128,7 @@ typedef struct NR_UE_RRC_INST_s {
     uint8_t kgnb[32];
     NR_CipheringAlgorithm_t  cipheringAlgorithm;
     e_NR_IntegrityProtAlgorithm  integrityProtAlgorithm;
-  
-    /* Used integrity/ciphering algorithms */
-    //RRC_LIST_TYPE(NR_SecurityAlgorithmConfig_t, NR_SecurityAlgorithmConfig) SecurityAlgorithmConfig_list;
-    NR_CipheringAlgorithm_t  cipheringAlgorithm;
-    e_NR_IntegrityProtAlgorithm  integrityProtAlgorithm;
-
+    
     //  lists
     //  CellGroupConfig.rlc-BearerToAddModList
     RRC_LIST_TYPE(NR_RLC_BearerConfig_t, NR_maxLC_ID) RLC_Bearer_Config_list;

openair3/NGAP/ngap_gNB_nas_procedures.c

@@ -225,11 +225,7 @@ int ngap_gNB_handle_nas_first_req(
 
     ie->value.choice.UserLocationInformation.present = NGAP_UserLocationInformation_PR_userLocationInformationNR;
 
-<<<<<<< HEAD
     ie->value.choice.UserLocationInformation.choice.userLocationInformationNR = 
-=======
-    ie->value.choice.UserLocationInformation.choice.userLocationInformationNR =
->>>>>>> b67badef1b2fd390d801e20644b08df0d5880583
         CALLOC(1, sizeof(*ie->value.choice.UserLocationInformation.choice.userLocationInformationNR));
     userinfo_nr_p = ie->value.choice.UserLocationInformation.choice.userLocationInformationNR;