diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..55ce861
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+# Never merge settings.py - always use branch version
+settings.py merge=ours
diff --git a/mysite/urls.py b/mysite/urls.py
index 1e31e02..b2e310c 100644
--- a/mysite/urls.py
+++ b/mysite/urls.py
@@ -4,6 +4,7 @@ from .views import Doxme, home, robots
 
 urlpatterns = [
     path('home/', home),
+    path('', home),
     path('robots.txt/', robots),
     path('doxme/', Doxme.as_view()),
 ]