diff --git a/web_server/src/main.rs b/web_server/src/main.rs
index a986d93d5..23701e128 100644
--- a/web_server/src/main.rs
+++ b/web_server/src/main.rs
@@ -94,16 +94,13 @@ async fn main() {
 
     // run our app with hyper
     // `axum::Server` is a re-export of `hyper::Server`
-<<<<<<< master
     let addr = if cfg!(debug_assertions) {
         SocketAddr::from(([127, 0, 0, 1], 3000)) 
     }
     else {
         SocketAddr::from(([0, 0, 0, 0], 3000))
     };
-=======
-    let addr = SocketAddr::from(([0, 0, 0, 0], 3000));
->>>>>>> master
+    // http://127.0.0.1:3000
     println!("listening on {}", addr);
     tracing::debug!("listening on {}", addr);
     axum::Server::bind(&addr)