fix: merge develop

packages/medusa-file-spaces/package.json

@@ -40,11 +40,7 @@
     "aws-sdk": "^2.710.0",
     "body-parser": "^1.19.0",
     "express": "^4.17.1",
-<<<<<<< HEAD
-    "medusa-core-utils": "^1.1.4",
-=======
     "medusa-core-utils": "^1.1.5",
->>>>>>> origin/develop
     "medusa-test-utils": "^1.1.8",
     "stripe": "^8.50.0"
   },