diff --git a/srcs/open_dhcp/query.cpp b/srcs/open_dhcp/query.cpp
index ad3e8ab..0bb508f 100644
--- a/srcs/open_dhcp/query.cpp
+++ b/srcs/open_dhcp/query.cpp
@@ -861,12 +861,8 @@ void opendhcp_init_http_server() {
         hw_http_add_route("/", opendhcp_http_info, nullptr);
         hw_http_add_route("dhcp/info/getuser", opendhcp_http_get_userinfo, nullptr);
         hw_http_add_route("dhcp/info/allusers", opendhcp_http_get_alluser, nullptr);
-<<<<<<< HEAD
-        hw_http_add_route("dhcp/config/rangeset", opendhcp_http_expand_rangeset, nullptr);
-=======
         hw_http_add_route("dhcp/config/rangeset", opendhcp_http_add_rangeset, nullptr);
         hw_http_add_route("dhcp/delete/rangeset", opendhcp_http_delete_rangeset, nullptr);
->>>>>>> origin/master
         added = TRUE;
     }
 }
\ No newline at end of file