resolving Sass issues caused by previous merge conflict resolution in branch

cms/static/sass/_assets.scss

@@ -4,13 +4,7 @@
     width: 260px;
     background-color: #fff;
   }
-  .upload-button {
-    @include blue-button;
-    float: left;
-    margin-right: 20px;
-    padding: 8px 30px 10px;
-    font-size: 12px;
-  }
+
   .asset-library {
     @include clearfix;
 

cms/static/sass/_base.scss

@@ -34,30 +34,6 @@ h1 {
     margin: 24px 6px;
 }
 
-strong {
-    font-weight: 700;
-}
-
-em {
-    font-style: italic;
-}
-
-p + p,
-p + ul,
-p + ol {
-    margin-top: 20px;
-}
-
-code {
-    margin: 0 2px;
-    padding: 0px 5px;
-    border-radius: 3px;
-    border: 1px solid #eaeaea;
-    font-family: Monaco, monospace;
-    font-size: 12px;
-    background-color: #f8f8f8;
-}
-
 .waiting {
     opacity: 0.1;
 }