diff --git a/examples/css-sass/CHANGELOG.md b/examples/css-sass/CHANGELOG.md
index 535a8dd0b..dbc1a3e84 100644
--- a/examples/css-sass/CHANGELOG.md
+++ b/examples/css-sass/CHANGELOG.md
@@ -3,6 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<<<<<<< HEAD
 <a name="0.3.3"></a>
 ## [0.3.3](https://github.com/pedronauck/docz/compare/v0.3.2...v0.3.3) (2018-06-26)
 
@@ -30,6 +31,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+=======
+>>>>>>> 3b032f823c1ef6e777351365bdc0c919db232086
 <a name="0.3.0"></a>
 # [0.3.0](https://github.com/pedronauck/docz/compare/v0.3.0-beta.0...v0.3.0) (2018-06-25)
 
diff --git a/examples/flow/CHANGELOG.md b/examples/flow/CHANGELOG.md
index 94bebdf99..8ed32c1af 100644
--- a/examples/flow/CHANGELOG.md
+++ b/examples/flow/CHANGELOG.md
@@ -3,6 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+<<<<<<< HEAD
 <a name="0.3.3"></a>
 ## [0.3.3](https://github.com/pedronauck/docz/compare/v0.3.2...v0.3.3) (2018-06-26)
 
@@ -33,6 +34,8 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
+=======
+>>>>>>> 3b032f823c1ef6e777351365bdc0c919db232086
 <a name="0.3.0"></a>
 # [0.3.0](https://github.com/pedronauck/docz/compare/v0.3.0-beta.0...v0.3.0) (2018-06-25)
 
diff --git a/packages/docz/package.json b/packages/docz/package.json
index f77b73d87..9a1baf693 100644
--- a/packages/docz/package.json
+++ b/packages/docz/package.json
@@ -28,6 +28,7 @@
     "@sindresorhus/slugify": "^0.3.0",
     "deepmerge": "^2.1.1",
     "docz-core": "^0.3.3",
+    "docz-theme-default": "^0.3.3",
     "invariant": "^2.2.4",
     "loadable-components": "^2.2.2",
     "pascalcase": "^0.1.1",