diff --git a/ultron/followup/urls.py b/ultron/followup/urls.py
index 06ea95c162..ce13f8f1f4 100644
--- a/ultron/followup/urls.py
+++ b/ultron/followup/urls.py
@@ -49,23 +49,6 @@ urlpatterns = [
     path(r"note/details/<int:note_id>/", views.note_details, name="note_details"),
 
 
-<<<<<<< HEAD
-=======
-    path(r"chrono/details/<int:chrono_id>/add/", views.jump_chrono_values_create_or_update, name="jump_chrono_values_create_or_update"),
-    path(
-        r"chrono/add_jump_chrono_value/",
-        views.add_jump_chrono_value,
-        name="add_jump_chrono_value"
-    ),
-    path(
-        r"chrono/remove_jump_chrono_value/",
-        views.remove_jump_chrono_value,
-        name="remove_jump_chrono_value"
-    ),
-    path(r"chrono/detailed_score_for_date_range/<int:gymnast_id>/<int:routine_type>/<str:date_begin>/<str:date_end>/", views.average_jump_chrono_details_between_two_date, name="average_jump_chrono_details_between_two_date"),
-
-
->>>>>>> af9684f (Bug fix in followup/urls.py file)
     path(r"learnedskill/add/", views.learnedskill_create_or_update, name="learnedskill_create"),
     path(
         r"learnedskill/add/<int:gymnast_id>/",