diff --git a/app/Views/member_layout/header.php b/app/Views/member_layout/header.php
index ba95b44..cf9050a 100644
--- a/app/Views/member_layout/header.php
+++ b/app/Views/member_layout/header.php
@@ -39,14 +39,8 @@
     <div class="container">
         <div class="row">
             <div class="col-lg-12">
-<<<<<<< HEAD
-                <div class="nav-main">
-                    <img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-footer-Logo-White.png" alt="">
-                   
-=======
                 <div class="nav-main">                    
                     <a href="https://golfevolutionkelowna.ca" rel="home"><img src="<?= base_url()."/public"; ?>/assets/member_images/GolfEvolution-Logo-Colour.png" alt="" width="100" height="74"></a>
->>>>>>> e2e465227c3030587f5034ea27459a04bd2c43c2
                     <button class="button-menu"><i class="fa fa-bars"></i></button>
                 </div>
             </div>