diff --git a/openair3/NAS/NR_UE/nas_nrue_task.c b/openair3/NAS/NR_UE/nas_nrue_task.c
index d2740c2a1a45c67f55f32be0a22f9f2e373fb5c8..30d89160e64915cfeccda031963f024e03f515dc 100644
--- a/openair3/NAS/NR_UE/nas_nrue_task.c
+++ b/openair3/NAS/NR_UE/nas_nrue_task.c
@@ -330,9 +330,4 @@ int encode_authenticationresponse(authenticationresponse_t *authentication_respo
 <<<<<<< HEAD
 }
 >>>>>>> parent of d659e98df... Update nas_nrue_task.c
-=======
 }
->>>>>>> parent of d659e98df... Update nas_nrue_task.c
-=======
-}
->>>>>>> parent of d659e98df... Update nas_nrue_task.c