diff --git a/web/onos-topology.html b/web/onos-topology.html
index 725866a..72e9fc4 100644
--- a/web/onos-topology.html
+++ b/web/onos-topology.html
@@ -52,13 +52,8 @@
 <div id="topology"></div>
 <script type="text/javascript" src="js/controller-status.js"></script>
 <script type="text/javascript">
-<<<<<<< Updated upstream
 controller_status("http://gui3.onlab.us:8081/controller_status");
 gui("http://gui3.onlab.us:8081/topology");
-=======
-controller_status("http://localhost:9000/controller_status");
-gui("http://localhost:9000/topology");
->>>>>>> Stashed changes
 </script>
 </svg>
 </body>