From 8cff73dc399a0982962a0e2e1e29d67cc28c7dc1 Mon Sep 17 00:00:00 2001
From: "masayuki.harada" <masayuki.harada@jp.fujitsu.com>
Date: Wed, 28 Oct 2020 03:19:41 +0900
Subject: [PATCH] Fix merge error.

---
 cmake_targets/CMakeLists.txt            | 1 +
 openair2/RRC/NR_UE/rrc_defs.h           | 7 +------
 openair3/NGAP/ngap_gNB_nas_procedures.c | 4 ----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 136be3f946..f530b60530 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/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}
diff --git a/openair2/RRC/NR_UE/rrc_defs.h b/openair2/RRC/NR_UE/rrc_defs.h
index 5fda05eeb1..a2c66e4961 100644
--- a/openair2/RRC/NR_UE/rrc_defs.h
+++ b/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;
diff --git a/openair3/NGAP/ngap_gNB_nas_procedures.c b/openair3/NGAP/ngap_gNB_nas_procedures.c
index 13d4213d37..10b5baf31c 100644
--- a/openair3/NGAP/ngap_gNB_nas_procedures.c
+++ b/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;