diff --git a/filter/filter_test.go b/filter/filter_test.go
index 9629f688..a027758e 100644
--- a/filter/filter_test.go
+++ b/filter/filter_test.go
@@ -143,8 +143,15 @@ func BenchmarkDifference(b *testing.B) {
 >>>>>>> 450df394... filter: benchmark: remove \n from log
 	for n := 0; n < b.N; n++ {
 		for _, x := range testPackets {
+<<<<<<< HEAD
 			f.Write(x)
 >>>>>>> 31ccc30a... benchmark testing file
+=======
+			_, err := f.Write(x)
+			if err != nil {
+				b.Fatalf("cannot write to diff filter: %v#", err)
+			}
+>>>>>>> 3800faf9... filter: benchmark: error checking for write function update descriptions
 		}
 	}
 }
diff --git a/filter/tests.go b/filter/tests.go
index 0cc3bc39..d74129f8 100644
--- a/filter/tests.go
+++ b/filter/tests.go
@@ -1,5 +1,6 @@
 /*
 DESCRIPTION
+<<<<<<< HEAD
 <<<<<<< HEAD
   tests.go contains 15 JPEG frames in hex used for testing in filter_test.go.
   These are used to test the benchmarking for the filters found in this
@@ -9,6 +10,11 @@ DESCRIPTION
   These are used to test the benchmarking for the filters found in this
 	folder, the output of the filters can be found in testout/test_outFILTER.mjpeg
 >>>>>>> 03d46b19... filter: benchmark: chaning descriptions
+=======
+  tests.go contains 15 JPEG frames in hex used for testing in filter_test.go.
+  These are used to test the benchmarking for the filters found in this
+  folder, the output of the filters can be found in testout/test_outFILTER.mjpeg
+>>>>>>> 3800faf9... filter: benchmark: error checking for write function update descriptions
 
 AUTHOR
   Ella Pietraroia <ella@ausocean.org>