diff --git a/src/sparse/impl/KokkosSparse_spmv_spec.hpp b/src/sparse/impl/KokkosSparse_spmv_spec.hpp
index f176ed9fe2..e0fdb2b6cd 100644
--- a/src/sparse/impl/KokkosSparse_spmv_spec.hpp
+++ b/src/sparse/impl/KokkosSparse_spmv_spec.hpp
@@ -305,13 +305,8 @@ struct SPMV_MV<AT, AO, AD, AM, AS, XT, XL, XD, XM, YT, YL, YD, YM, true, false,
 };
 #endif
 
-<<<<<<< HEAD
 }  // namespace Impl
 }  // namespace KokkosSparse
-=======
-}
-}
->>>>>>> Experimental tensor-core SpMV for BlockCrsMatrix with block size 16
 
 //
 // Macro for declaration of full specialization of