motify the amf.conf

etc/amf.conf

@@ -65,7 +65,6 @@ AMF =
       PORT           = 38412;                            # YOUR NETWORK CONFIG HERE
       PPID           = 60;                               # YOUR NETWORK CONFIG HERE
     };
-<<<<<<< HEAD
 	 # AMF binded interface for Nausf interface
     NAUSF:
     {
@@ -74,17 +73,13 @@ AMF =
       PORT           = 8383;               # YOUR NETWORK CONFIG HERE
     };
 
-    N11:{
-=======
     
-    # AMF binded interface for N11 
     N11:
     {
       INTERFACE_NAME = "@AMF_INTERFACE_NAME_FOR_N11@"; # YOUR NETWORK CONFIG HERE
       IPV4_ADDRESS   = "read"; 
       PORT           = 80;                             # YOUR NETWORK CONFIG HERE
       
->>>>>>> prepare_merge_handover
       SMF_INSTANCES_POOL = (
         {SMF_INSTANCE_ID = @SMF_INSTANCE_ID_0@; IPV4_ADDRESS = "@SMF_IPV4_ADDR_0@"; PORT = "80"; VERSION = "@SMF_HTTP_VERSION_0@"; SELECTED = "true"},   # YOUR SMF CONFIG HERE
         {SMF_INSTANCE_ID = @SMF_INSTANCE_ID_1@; IPV4_ADDRESS = "@SMF_IPV4_ADDR_1@"; PORT = "80"; VERSION = "@SMF_HTTP_VERSION_1@"; SELECTED = "false"} # YOUR SMF CONFIG HERE