diff --git a/include/ss/parser.hpp b/include/ss/parser.hpp
index 0f6bf02..5f4cae7 100644
--- a/include/ss/parser.hpp
+++ b/include/ss/parser.hpp
@@ -681,13 +681,8 @@ private:
                         }
                     }
 
-<<<<<<< Updated upstream
-                    next_line_converter_.resplit(next_line_buffer_, size,
-                                                 delim_);
-=======
                     next_line_converter_.resplit(next_line_buffer_,
                                                  next_line_size_, delim_);
->>>>>>> Stashed changes
                 }
             }
         }