fix conflicts

Author: taylorotwell

Eloquent/Collection.php

@@ -280,6 +280,23 @@ public function map(callable $callback)
         }) ? $result->toBase() : $result;
     }
 
+    /**
+     * Run an associative map over each of the items.
+     *
+     * The callback should return an associative array with a single key / value pair.
+     *
+     * @param  callable  $callback
+     * @return \Illuminate\Support\Collection|static
+     */
+    public function mapWithKeys(callable $callback)
+    {
+        $result = parent::mapWithKeys($callback);
+
+        return $result->contains(function ($item) {
+            return ! $item instanceof Model;
+        }) ? $result->toBase() : $result;
+    }
+
     /**
      * Reload a fresh model instance from the database for all the entities.
      *

Eloquent/Relations/Concerns/AsPivot.php

@@ -286,6 +286,8 @@ public function newQueryForRestoration($ids)
      */
     protected function newQueryForCollectionRestoration(array $ids)
     {
+        $ids = array_values($ids);
+
         if (! Str::contains($ids[0], ':')) {
             return parent::newQueryForRestoration($ids);
         }

Eloquent/Relations/MorphPivot.php

@@ -139,6 +139,8 @@ public function newQueryForRestoration($ids)
      */
     protected function newQueryForCollectionRestoration(array $ids)
     {
+        $ids = array_values($ids);
+
         if (! Str::contains($ids[0], ':')) {
             return parent::newQueryForRestoration($ids);
         }