Fix conflicts

packages/strapi-admin/.gitignore

@@ -1,6 +1,7 @@
 # Don't check auto-generated stuff into git
 coverage
 node_modules
+build
 stats.json
 package-lock.json
 

packages/strapi-admin/admin/src/components/LeftMenuLink/styles.scss

@@ -17,6 +17,7 @@
   color: $left-menu-link-color;
   text-decoration: none;
   display: block;
+  -webkit-font-smoothing: antialiased;
 
   &:hover {
     color: $white;
@@ -43,7 +44,6 @@
 .linkIcon {
   position: relative;
   margin-right: 1.2rem;
-  vertical-align: middle;
   font-size: 1.2rem;
   width: 1.4rem;
   height: 1.2rem;

packages/strapi-admin/admin/src/components/LeftMenuLinkContainer/index.js

@@ -79,7 +79,7 @@ function LeftMenuLinkContainer({ plugins }) {
         <p className={styles.title}><FormattedMessage {...messages.general} /></p>
         <ul className={styles.list}>
           <LeftMenuLink
-            icon="cubes"
+            icon="puzzle-piece"
             label={messages.listPlugins.id}
             destination="/list-plugins"
           />

packages/strapi-admin/admin/src/containers/HomePage/styles.scss

@@ -60,7 +60,7 @@
   &:active {
    box-shadow: inset 1px 1px 3px rgba(0,0,0,.15);
  }
- padding-top: 4px;
+
  padding-left: 1.6rem;
  padding-right: 1.6rem;
  &:before {

packages/strapi-admin/package.json

@@ -44,4 +44,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-helper-plugin/lib/src/components/Button/styles.scss

@@ -77,7 +77,6 @@
   &:active {
    box-shadow: inset 1px 1px 3px rgba(0,0,0,.15);
  }
- padding-top: 4px;
  padding-left: 1.6rem;
  padding-right: 1.6rem;
  &:before {

packages/strapi-plugin-content-manager/package.json

@@ -48,4 +48,4 @@
     "react-select": "^1.0.0-rc.5",
     "strapi-helper-plugin": "3.0.0-alpha.6.7"
   }
-}
+}

packages/strapi-plugin-content-type-builder/package.json

@@ -48,4 +48,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}

packages/strapi-plugin-settings-manager/package.json

@@ -45,4 +45,4 @@
     "npm": ">= 3.0.0"
   },
   "license": "MIT"
-}
+}