diff --git a/py-json/create_wanlink.py b/py-json/create_wanlink.py
index beba2e89..3e1f00e8 100755
--- a/py-json/create_wanlink.py
+++ b/py-json/create_wanlink.py
@@ -210,7 +210,6 @@ def main():
    print("Wanlink is stopped.")
 
    print("Wanlink info:")
-<<<<<<< HEAD
    lf_r = LFRequest.LFRequest(base_url+"/wl/wl_eg1")
    json_response = lf_r.getAsJson()
    LFUtils.debug_printer.pprint(json_response)
@@ -222,9 +221,6 @@ def main():
    lf_r = LFRequest.LFRequest(base_url+"/wl_ep/wl_eg1-B")
    json_response = lf_r.getAsJson()
    LFUtils.debug_printer.pprint(json_response)
-=======
-   json_response = LFRequest.LFRequest(base_url+"/")
->>>>>>> create_wanlink fixes perl dict values
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 if __name__ == '__main__':