resolved merge conflict

Author: ArnabChatterjee20k

src/Migration/Cache.php

@@ -27,11 +27,11 @@ public function __construct()
     }
 
     /**
- * Get cache key from resource
- *
- * @param Resource $resource
- * @return string
- */
+     * Get cache key from resource
+     *
+     * @param Resource $resource
+     * @return string
+    */
     public function resolveResourceCacheKey(Resource $resource): string
     {
         if (! $resource->getSequence()) {