diff --git a/.github/workflows/previews-deploy.yml b/.github/workflows/previews-deploy.yml
index 29b0d7aa04..f7c0077fde 100644
--- a/.github/workflows/previews-deploy.yml
+++ b/.github/workflows/previews-deploy.yml
@@ -103,11 +103,7 @@ jobs:
           curl https://raw.githubusercontent.com/gradio-app/gradio/main/scripts/upload_demo_to_space.py -o scripts/upload_demo_to_space.py
           curl https://raw.githubusercontent.com/gradio-app/gradio/main/scripts/upload_website_demos.py -o scripts/upload_website_demos.py
       - name: make dirs
-<<<<<<< HEAD
         run: mkdir -p demo/all_demos && mv demo/* demo/all_demos/
-=======
-        run: mkdir -p demo/all_demos && mv demo demo/all_demos
->>>>>>> main
       - name: Upload demo to spaces
         if: github.event.workflow_run.event == 'pull_request'
         id: upload-demo
diff --git a/package.json b/package.json
index 5d75fb45e5..5b59470d89 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
 		"test:browser:verbose": "pnpm test:browser",
 		"test:browser:dev": "pnpm --filter @gradio/app test:browser:dev",
 		"storybook": "storybook dev -p 6006 --config-dir js/storybook",
-		"build-storybook": "storybook build --config-dir js/storybook",
+		"build-storybook": "storybook build --config-dir js/storybook --webpack-stats-json",
 		"ci:version": "changeset version && pnpm i --lockfile-only && node ./.changeset/fix_changelogs.cjs",
 		"ci:publish": "pnpm changeset tag && git push origin --tags && pnpm publish --no-git-checks --access public -r --filter=@gradio/*",
 		"chromatic": "chromatic",