diff --git a/tests/fixtures/test_reader.h b/tests/fixtures/test_reader.h
index d53ecf762..70b521f02 100644
--- a/tests/fixtures/test_reader.h
+++ b/tests/fixtures/test_reader.h
@@ -47,5 +47,4 @@ class TestReader : public vsag::Reader {
     vsag::Binary binary_;
 };
 
-<<<<<<< HEAD
 }  // namespace fixtures