diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index c421149c0..0c9417823 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -1,10 +1,6 @@
 <div class="navHomepage">
   <div class="navHomepageLogo fl">
-<<<<<<< HEAD
     <%=link_to image_tag("../images/logo_blue.png",width:"51px", height: "45px",class: "mt3"), home_path()%>
-=======
-    <%=link_to image_tag("../images/logo_blue.png",width:"51px", height: "45px",class: "mt3"), homes_path()%>
->>>>>>> dev-homepage-revision
   </div>
   <div class="fl">
     <ul>