diff --git a/ultron/followup/urls.py b/ultron/followup/urls.py
index bd29cae3f3..9fdccfc39a 100644
--- a/ultron/followup/urls.py
+++ b/ultron/followup/urls.py
@@ -65,7 +65,6 @@ urlpatterns = [
         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"),
->>>>>>> 31a996c (CTRL+Z)
 
 
     path(r"learnedskill/add/", views.learnedskill_create_or_update, name="learnedskill_create"),