diff --git a/rowers/templates/fastestvirtualeventcreate.html b/rowers/templates/fastestvirtualeventcreate.html
index d577973e..7034c3f3 100644
--- a/rowers/templates/fastestvirtualeventcreate.html
+++ b/rowers/templates/fastestvirtualeventcreate.html
@@ -55,11 +55,7 @@
           The participants can row this challenge on any course, and their fastest time
           over the challenge distance (respectively the largest distance achieved over the
           challenge duration) is automatically extracted from the workout. No
-<<<<<<< HEAD
-          need to program a set piece. 
-=======
           need to program a set piece.
->>>>>>> develop
         </p>
         <p>
           Standard Times are a way to compare results in a race category with