cangig the conflict 1

Author: stan-dot

backstage/packages/backend/package.json

@@ -57,4 +57,4 @@
   "files": [
     "dist"
   ]
-}
+}