diff --git a/scores/urls.py b/scores/urls.py
index 43fdce4..d780f10 100644
--- a/scores/urls.py
+++ b/scores/urls.py
@@ -20,9 +20,5 @@ from . import views
 
 urlpatterns = [
     path('', views.index, name='index'),
-<<<<<<< HEAD
-    path('test', views.test, name='test'),
-=======
     path('match/<int:match_id>/', views.match, name='match'),
->>>>>>> 90c18ed (mass updates)
 ]