diff --git a/dogconfig/dogproject/settings.py b/dogconfig/dogproject/settings.py
index b68a97e..fb66a2f 100644
--- a/dogconfig/dogproject/settings.py
+++ b/dogconfig/dogproject/settings.py
@@ -51,7 +51,7 @@
 
 # https://knasmueller.net/fix-djangos-debug-toolbar-not-showing-inside-docker
 import socket
-hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
+hostname, _, ips = socket.gethostbyname_ex("localhost")
 INTERNAL_IPS += [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
 
 # Application definition
diff --git a/dogconfig/dogproject/urls.py b/dogconfig/dogproject/urls.py
index e0a46cc..d74544f 100644
--- a/dogconfig/dogproject/urls.py
+++ b/dogconfig/dogproject/urls.py
@@ -5,16 +5,12 @@
 from drf_spectacular.views import SpectacularAPIView, SpectacularJSONAPIView
 from rest_framework.permissions import AllowAny
 
-<<<<<<< HEAD
-from dogapi.views_api import fetch, identify, is_pid, sniff
+
 from dogui.views_ui import home
-=======
-from dogapi.views_api import fetch, identify, sniff, expand_datatype
->>>>>>> main
+from dogapi.views_api import fetch, identify, sniff, is_pid, expand_datatype
 
 
 urlpatterns = [
-<<<<<<< HEAD
     re_path(r'api/openapi.yml', SpectacularAPIView.as_view(), name='openapi_schema_yml'),
     re_path(r'api/openapi.json', SpectacularJSONAPIView.as_view(), name='openapi_schema_json'),
 
@@ -24,13 +20,5 @@
     path('api/ispid/', is_pid, name='is pid'),
     path('', home, name='main'),
     path('__debug__/', include('debug_toolbar.urls')),
-=======
-    re_path(r'^swagger(?P<format>\.json|\.yaml)$', schema_view.without_ui(cache_timeout=0), name='schema-json'),
-    re_path(r'^swagger/$', schema_view.with_ui('swagger', cache_timeout=0), name='schema-swagger-ui'),
-    re_path(r'^redoc/$', schema_view.with_ui('redoc', cache_timeout=0), name='schema-redoc'),
-    path('fetch/', fetch, name='fetch'),
-    path('identify/', identify, name='identify'),
-    path('sniff/', sniff, name='sniff'),
     path('expanddatatype/', expand_datatype, name='expand data type'),
->>>>>>> main
 ]