diff --git a/rowers/templates/plannedsessionscoach.html b/rowers/templates/plannedsessionscoach.html
index 26752588..dd0a76fa 100644
--- a/rowers/templates/plannedsessionscoach.html
+++ b/rowers/templates/plannedsessionscoach.html
@@ -111,13 +111,13 @@
           {% if workout.user.user == user or user == team.manager %}
           {% if workout.name != '' %}
           <td>
-            <a href={% url rower.defaultlandingpage id=workout.id %}>
+            <a href={% url rower.defaultlandingpage id=workout.id|encode %}>
               {{ workout.name }}
             </a>
           </td>
           {% else %}
           <td>
-            <a href={% url rower.defaultlandingpage id=workout.id %}>No Name
+            <a href={% url rower.defaultlandingpage id=workout.id|encode %}>No Name
           </a></td> 
           {% endif %}
 
diff --git a/rowers/tests/test_uploads.py b/rowers/tests/test_uploads.py
index b21321a3..ccb64a4b 100644
--- a/rowers/tests/test_uploads.py
+++ b/rowers/tests/test_uploads.py
@@ -71,12 +71,13 @@ class ViewTest(TestCase):
 	self.assertEqual(response.status_code, 200)
 
 
-        response = self.c.get('/rowers/workout/'+encoded1+'/workflow/',
-	self.assertEqual(response.status_code, 200)
+
 
         response = self.c.get('/rowers/workout/'+encoded1+'/workflow/',
                               follow=True)
 
+	self.assertEqual(response.status_code, 200)
+
         response = self.c.get('/rowers/workout/'+encoded1+'/get-thumbnails/',
                               follow=True)
 
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index 66d60f97..af7c4855 100644
Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ
diff --git a/rowers/tests/testdata/testdata.tcx b/rowers/tests/testdata/testdata.tcx
index 47eb17dc..28c4ef15 100644
--- a/rowers/tests/testdata/testdata.tcx
+++ b/rowers/tests/testdata/testdata.tcx
@@ -2502,11 +2502,7 @@
           </Trackpoint>
         </Track>
       </Lap>
-<<<<<<< HEAD
-      <Notes>&lt;Element 'Notes' at 0x12e40c18&gt;</Notes>
-=======
-      <Notes>&lt;Element 'Notes' at 0x13918240&gt;</Notes>
->>>>>>> develop
+      <Notes>&lt;Element 'Notes' at 0x157a2e48&gt;</Notes>
     </Activity>
   </Activities>
   <Creator>