diff --git a/packages/zapp/console/src/components/common/test/ContentContainer.spec.tsx b/packages/zapp/console/src/components/common/test/ContentContainer.spec.tsx
deleted file mode 100644
index 65d1f1813..000000000
--- a/packages/zapp/console/src/components/common/test/ContentContainer.spec.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import * as React from 'react';
-import * as renderer from 'react-test-renderer';
-
-import { ContentContainer } from '../ContentContainer';
-
-const Content = () => <div>the content</div>;
-
-describe('ContentContainer', () => {
-  it('matches the known snapshot', () => {
-    expect(
-      renderer
-        .create(
-          <ContentContainer>
-            <Content />
-          </ContentContainer>,
-        )
-        .toJSON(),
-    ).toMatchSnapshot();
-  });
-
-  describe('in centered mode', () => {
-    it('matches the known snapshot', () => {
-      expect(
-        renderer
-          .create(
-            <ContentContainer center={true}>
-              <Content />
-            </ContentContainer>,
-          )
-          .toJSON(),
-      ).toMatchSnapshot();
-    });
-  });
-});
diff --git a/packages/zapp/console/src/components/common/test/__snapshots__/ContentContainer.spec.tsx.snap b/packages/zapp/console/src/components/common/test/__snapshots__/ContentContainer.spec.tsx.snap
deleted file mode 100644
index c16ab54ec..000000000
--- a/packages/zapp/console/src/components/common/test/__snapshots__/ContentContainer.spec.tsx.snap
+++ /dev/null
@@ -1,33 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ContentContainer in centered mode matches the known snapshot 1`] = `
-<div
-  className="makeStyles-root-1 centered"
-  id="content-container"
-  style={
-    Object {
-      "marginRight": "auto",
-    }
-  }
->
-  <div>
-    the content
-  </div>
-</div>
-`;
-
-exports[`ContentContainer matches the known snapshot 1`] = `
-<div
-  className="makeStyles-root-1"
-  id="content-container"
-  style={
-    Object {
-      "marginRight": "auto",
-    }
-  }
->
-  <div>
-    the content
-  </div>
-</div>
-`;
diff --git a/yarn.lock b/yarn.lock
index 0c2eee12f..871b98cf1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5173,7 +5173,11 @@ aria-query@^5.0.0:
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+<<<<<<< HEAD
   integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
+=======
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+>>>>>>> ci: move storybook related packages to top level (#434)
 
 arr-flatten@^1.1.0:
   version "1.1.0"
@@ -5641,11 +5645,6 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base16@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/base16/-/base16-1.0.0.tgz#e297f60d7ec1014a7a971a39ebc8a98c0b681e70"
-  integrity sha1-4pf2DX7BAUp6lxo568ipjAtoHnA=
-
 base64-js@^1.0.2, base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -7417,7 +7416,11 @@ css-loader@^5.0.1:
     schema-utils "^3.0.0"
     semver "^7.3.5"
 
+<<<<<<< HEAD
 css-select@^1.1.0, css-select@~1.2.0:
+=======
+css-select@^1.1.0:
+>>>>>>> ci: move storybook related packages to top level (#434)
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
   integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
@@ -12947,11 +12950,6 @@ lodash.clonedeep@^4.5.0, lodash.clonedeep@~4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
-lodash.curry@^4.0.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170"
-  integrity sha1-JI42By7ekGUB11lmIAqG2riyMXA=
-
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
@@ -12967,11 +12965,6 @@ lodash.escaperegexp@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
   integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
 
-lodash.flow@^3.3.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.flow/-/lodash.flow-3.5.0.tgz#87bf40292b8cf83e4e8ce1a3ae4209e20071675a"
-  integrity sha1-h79AKSuM+D5OjOGjrkIJ4gBxZ1o=
-
 lodash.ismatch@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
@@ -15671,11 +15664,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-pure-color@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/pure-color/-/pure-color-1.3.0.tgz#1fe064fb0ac851f0de61320a8bf796836422f33e"
-  integrity sha1-H+Bk+wrIUfDeYTIKi/eWg2Qi8z4=
-
 q@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
@@ -15817,6 +15805,7 @@ rc@^1.0.1, rc@^1.1.6, rc@^1.2.7, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
+<<<<<<< HEAD
 react-base16-styling@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/react-base16-styling/-/react-base16-styling-0.6.0.tgz#ef2156d66cf4139695c8a167886cb69ea660792c"
@@ -15827,6 +15816,8 @@ react-base16-styling@^0.6.0:
     lodash.flow "^3.3.0"
     pure-color "^1.2.0"
 
+=======
+>>>>>>> ci: move storybook related packages to top level (#434)
 react-chartjs-2@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-4.0.0.tgz#a79919c9efe5381b8cb5abfd0ac7a56c9736cdb8"
@@ -15976,6 +15967,7 @@ react-is@^17.0.1:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339"
   integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==
 
+<<<<<<< HEAD
 react-json-view@^1.21.3:
   version "1.21.3"
   resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.21.3.tgz#f184209ee8f1bf374fb0c41b0813cff54549c475"
@@ -15986,6 +15978,8 @@ react-json-view@^1.21.3:
     react-lifecycles-compat "^3.0.4"
     react-textarea-autosize "^8.3.2"
 
+=======
+>>>>>>> ci: move storybook related packages to top level (#434)
 react-lifecycles-compat@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
@@ -16100,7 +16094,11 @@ react-syntax-highlighter@^13.5.3:
     prismjs "^1.21.0"
     refractor "^3.1.0"
 
+<<<<<<< HEAD
 react-textarea-autosize@^8.3.0, react-textarea-autosize@^8.3.2:
+=======
+react-textarea-autosize@^8.3.0:
+>>>>>>> ci: move storybook related packages to top level (#434)
   version "8.3.3"
   resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8"
   integrity sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ==