diff --git a/filter/filter_test.go b/filter/filter_test.go
index 39502a51..9629f688 100644
--- a/filter/filter_test.go
+++ b/filter/filter_test.go
@@ -98,8 +98,12 @@ const (
 func BenchmarkBasic(b *testing.B) {
 	file, _ := os.Create(outBasic)
 	f := NewBasic(io.WriteCloser(file), debug, BasicThreshold, BasicPixels)
+<<<<<<< HEAD
 	b.Log("\nFrames: ", len(testPackets))
 >>>>>>> 60437c8c... filter: benchmark: upadte headers, add consts, print to log
+=======
+	b.Log("Frames: ", len(testPackets))
+>>>>>>> 450df394... filter: benchmark: remove \n from log
 	for n := 0; n < b.N; n++ {
 		for _, x := range testPackets {
 			_, err := f.Write(x)
@@ -131,8 +135,12 @@ func BenchmarkDifference(b *testing.B) {
 =======
 	file, _ := os.Create(outDiff)
 	f := NewDifference(io.WriteCloser(file), debug, DiffThreshold)
+<<<<<<< HEAD
 	b.Log("\nFrames: ", len(testPackets))
 >>>>>>> 60437c8c... filter: benchmark: upadte headers, add consts, print to log
+=======
+	b.Log("Frames: ", len(testPackets))
+>>>>>>> 450df394... filter: benchmark: remove \n from log
 	for n := 0; n < b.N; n++ {
 		for _, x := range testPackets {
 			f.Write(x)
@@ -166,8 +174,12 @@ func BenchmarkKNN(b *testing.B) {
 =======
 	file, _ := os.Create(outKNN)
 	f := NewKNN(io.WriteCloser(file), KNNMinArea, KNNThreshold, KNNHistory, KNNKernel, debug, motionInterval, motionDownscaling)
+<<<<<<< HEAD
 	b.Log("\nFrames: ", len(testPackets))
 >>>>>>> 60437c8c... filter: benchmark: upadte headers, add consts, print to log
+=======
+	b.Log("Frames: ", len(testPackets))
+>>>>>>> 450df394... filter: benchmark: remove \n from log
 	for n := 0; n < b.N; n++ {
 		for _, x := range testPackets {
 			_, err := f.Write(x)
@@ -202,8 +214,12 @@ func BenchmarkMOG(b *testing.B) {
 =======
 	file, _ := os.Create(outMOG)
 	f := NewMOG(io.WriteCloser(file), MOGMinArea, MOGThreshold, MOGHistory, debug, motionInterval, motionDownscaling)
+<<<<<<< HEAD
 	b.Log("\nFrames: ", len(testPackets))
 >>>>>>> 60437c8c... filter: benchmark: upadte headers, add consts, print to log
+=======
+	b.Log("Frames: ", len(testPackets))
+>>>>>>> 450df394... filter: benchmark: remove \n from log
 	for n := 0; n < b.N; n++ {
 		for _, x := range testPackets {
 			_, err := f.Write(x)