diff --git a/rowers/tasks.py b/rowers/tasks.py
index dc71b058..04918b30 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -357,8 +357,6 @@ def correct_intensity(workout):
 
     return workout
 
-<<<<<<< HEAD
-=======
 import io
 import zipfile
 
@@ -428,7 +426,6 @@ def email_all_user_workouts_zip(rower, start_date=None, end_date=None, debug=Fal
 
     return 1
     
->>>>>>> release/v23.9.0
 
 @app.task
 def handle_loadnextweek(rower, debug=False, **kwargs):