diff --git a/app/views/about_us.blade.php b/app/views/about_us.blade.php
index b1676688f605..68caa700259a 100644
--- a/app/views/about_us.blade.php
+++ b/app/views/about_us.blade.php
@@ -38,11 +38,7 @@
   <div class="navbar" style="margin-bottom:0px">
     <div class="container">
       <div class="navbar-inner">
-<<<<<<< HEAD
-        <a class="brand" href="#"><img src=
-=======
         <a class="brand" href="/"><img src=
->>>>>>> upstream/master
           "images/invoiceninja-logo.png"></a>
           <ul class="navbar-list">
             <li>{{ link_to('about', 'About Us' ) }}</li>
diff --git a/public/images/hero-bg-4.psd b/public/images/hero-bg-4.psd
deleted file mode 100644
index d231c69500a2..000000000000
Binary files a/public/images/hero-bg-4.psd and /dev/null differ