diff --git a/mssql.d b/mssql.d
index 7b882ed..e2baec4 100644
--- a/mssql.d
+++ b/mssql.d
@@ -156,10 +156,6 @@ class MsSqlResult : ResultSet {
 						if(ptr)
 							goto more;
 					}
-<<<<<<< HEAD
-=======
-				}
->>>>>>> 9d02
 					row ~= a;
 				}