diff --git a/uwe-flix/accounts/urls.py b/uwe-flix/accounts/urls.py
index c6a37a2dcb53a93be6ec41a2c8f03f775340d79e..3ddb18e1164d8700e78098d1d274f210a4ea7966 100644
--- a/uwe-flix/accounts/urls.py
+++ b/uwe-flix/accounts/urls.py
@@ -2,7 +2,6 @@ from django.urls import path
 from . import views
 
 urlpatterns = [
-<<<<<<< HEAD
     path("accounts/", views.accounts_list, name="accounts_list"),
     path("accounts/create_account/", views.account_create, name="create_account"),
     path(
@@ -64,25 +63,4 @@ urlpatterns = [
         views.credit_history,
         name="credit_history",
     ),
-=======
-    path('accounts/', views.accounts_list, name='accounts_list'),
-
-    path('accounts/create_account/', views.account_create, name='create_account'),
-    path('accounts/<int:pk>/update_account/', views.account_update, name='update_account'),
-    path('accounts/<int:pk>/delete_account/', views.account_delete, name='delete_account'),
-
-    path('accounts/<int:pk>/manage_statements/', views.statements_list, name='manage_statements'),
-    path('accounts/<int:pk>/generate_statement/', views.statement_generate, name='generate_statement'),
-    path('accounts/<int:pk>/manage_statements/<int:st_pk>/update/', views.statement_update, name='update_statement'),
-    path('accounts/<int:pk>/manage_statements/<int:st_pk>/delete/', views.statement_delete, name='delete_statement'),
-
-    path('accounts/<int:pk>/top_up_balance/', views.top_up_balance, name='top_up_balance'),
-    path('accounts/<int:pk>/top_up_club_balance/', views.top_up_club_balance, name='top_up_club_balance'),
-
-    path('accounts/create_student_discount_request/<int:pk>/', views.create_student_discount_request, name='create_student_discount_request'),
-    path('accounts/approve_student_discount_request/<int:pk>/', views.approve_student_discount_request, name='approve_student_discount_request'),
-    path('accounts/deny_student_discount_request/<int:pk>/', views.deny_student_discount_request, name='deny_student_discount_request'),
-
-    path('accounts/debit_history/<int:pk>/<int:config>/', views.debit_history, name='debit_history'),
->>>>>>> fd8c5c10a7d45e2bfd8277e43b7877018b70c0a2
 ]