fix conflicts

Eloquent/Relations/HasManyThrough.php

@@ -425,6 +425,16 @@ public function chunk($count, callable $callback)
         return $this->prepareQueryBuilder()->chunk($count, $callback);
     }
 
+    /**
+     * Get a generator for the given query.
+     *
+     * @return \Generator
+     */
+    public function cursor()
+    {
+        return $this->prepareQueryBuilder()->cursor();
+    }
+
     /**
      * Execute a callback over each item while chunking.
      *

Query/Grammars/SqlServerGrammar.php

@@ -185,7 +185,7 @@ protected function compileTableExpression($sql, $query)
     {
         $constraint = $this->compileRowConstraint($query);
 
-        return "select * from ({$sql}) as temp_table where row_num {$constraint}";
+        return "select * from ({$sql}) as temp_table where row_num {$constraint} order by row_num";
     }
 
     /**