diff --git a/website/public/css/static.styl b/website/public/css/static.styl
deleted file mode 100644
index 60a03024e8..0000000000
--- a/website/public/css/static.styl
+++ /dev/null
@@ -1,71 +0,0 @@
-@import "nib"
-
-// Vendor Includes - include first so we can override
-// Import only styles that do not have urls to images! Include them directly in the page!
-@import "../bower_components/angular-loading-bar/build/loading-bar.css"
-@import "./shared.styl"
-@import "./footer"
-
-body
-  margin-top: 60px
-
-#aboutPage
-  iframe
-    margin-bottom: 20px
-
-.muted i, i.muted
-  opacity:0.5
-
-#header-play-button
-  margin-right: 15px
-
-#tagline
-  margin:10px 0 20px 0
-  font-size:40px
-
-.marketing
-  text-align: center
-  
-.static-old-news
-  h2
-    font-weight: 700
-    font-size: 16px
-    margin-top: 30px
-    text-transform: uppercase
-  h3
-    font-weight: 700
-    font-size: 14px
-    margin-top: 20px
-  .pull-right
-    margin-left: 5px
-    
-#frontpage-play-button
-  //box-shadow: 0 0 40px #494141;
-  display: inline
-  font-size: 20px
-  min-width: 100px
-  height: 50px
-
-#about-page
-  img
-    box-shadow 0px 0px 10px 5px #888
-    margin 10px
-    max-width 500px
-
-// Accordion tweaks for FAQ
-
-a.h2.accordion
-  display: block
-  text-decoration: none
-
-a.h2.accordion:before
-  font-family: 'Glyphicons Halflings'
-  color: grey
-  content: "\e114"
-  margin-right: 0.5em
-
-a.h2.accordion.collapsed:before
-  font-family: 'Glyphicons Halflings'
-  color: grey
-  content: "\e080"
-  margin-right: 0.5em
diff --git a/website/views/static/merch.jade b/website/views/static/merch.jade
index 914f911879..2ba660ee76 100644
--- a/website/views/static/merch.jade
+++ b/website/views/static/merch.jade
@@ -11,7 +11,11 @@ extends ./layout
 
 block vars
     - var layoutEnv = env
+<<<<<<< HEAD
     - var merchNumbers = 2 // update the amount of merchandise attributes that are available
+=======
+    - var merchNumbers = 4 // update the amount of merchandise attributes that are available
+>>>>>>> a7c05de8e71d69406c33d529545e41d389d7de5d
 
 block title
     title=env.t('merch')