Forgot to fix this small conflict

source/stylesheets/landing.css

@@ -173,7 +173,6 @@ article {
     margin: 0 auto;
 }
->>>>>>> hi/new_landing_page
 .landing-feature-list {
     color: white;
     font-size: 19px;
@@ -384,7 +383,6 @@ h1.twitter-head{
     font-size: 135.71%;
     font-family: 'KorolevLight';
 }
-<<<<<<< HEAD
 .landing-header {
   line-height: 58px;