fix unsuccesful merge

Author: Rick Kim

_includes/css/agency.css

@@ -266,11 +266,7 @@ header {
     text-align: center;
     color: #fff;
     background-attachment: scroll;
-<<<<<<< HEAD
-    background-image: url(img/header-bg.jpg);
-=======
     background-image: url('{{ site.baseurl }}/img/header-bg.jpg');
->>>>>>> f4a84c0de43816db0c7e7a08d2a45c7344e140ad
     background-position: center center;
     background-repeat: none;
     -webkit-background-size: cover;