diff --git a/app/templates/styles/css/bootstrap.css b/app/templates/styles/css/bootstrap.css
index b204ac3..8760e2b 100644
--- a/app/templates/styles/css/bootstrap.css
+++ b/app/templates/styles/css/bootstrap.css
@@ -2538,52 +2538,16 @@ input[type="button"].btn-block {
   content: "\e051";
 }
 
-<<<<<<< HEAD
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  margin-top: 1px;
-  *margin-right: .3em;
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url("../images/glyphicons-halflings.png");
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
-=======
 .glyphicon-align-left:before {
   content: "\e052";
->>>>>>> Jumbotron
 }
 
 .glyphicon-align-center:before {
   content: "\e053";
 }
 
-<<<<<<< HEAD
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:focus > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > li > a:focus > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:focus > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"],
-.dropdown-submenu:focus > a > [class*=" icon-"] {
-  background-image: url("../images/glyphicons-halflings-white.png");
-=======
 .glyphicon-align-right:before {
   content: "\e054";
->>>>>>> Jumbotron
 }
 
 .glyphicon-align-justify:before {