diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index af7c4855..26b84f39 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 144ed946..e0e14ee9 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 0x157a2e48&gt;</Notes>
-=======
-      <Notes>&lt;Element 'Notes' at 0x1d49a6d8&gt;</Notes>
->>>>>>> develop
+      <Notes>&lt;Element 'Notes' at 0x13a90b38&gt;</Notes>
     </Activity>
   </Activities>
   <Creator>