resolved conflict

Author: Dev-JoyA

assets/static/vocabulary/css/vocabulary.css

@@ -43,9 +43,9 @@ EX:
 /* typography */
 
 body {
-    display: grid;
+    /* display: grid;
     grid-template-columns: 5% 3% 6% 6% 15% 30% 15% 6% 6% 3% 5%;
-    overflow-x: hidden;
+    overflow-x: hidden; */
 
     font-weight: 400;
     -moz-osx-font-smoothing: grayscale;

themes/vocabulary_theme/templates/layout.html

@@ -60,7 +60,7 @@
           <!-- <span aria-hidden="true"></span>
           <span aria-hidden="true"></span>
           <span aria-hidden="true"></span> -->
-         MENU
+         Menu
         </a>
       </div>
       <div class="navbar-menu">