diff --git a/Gemfile.lock b/Gemfile.lock
index 31724f1..d981efe 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,6 @@
 GIT
   remote: git://github.com/activeadmin/activeadmin.git
-<<<<<<< HEAD
-  revision: cc178ad0ebe1b74729eeaa59d5c7ad9b82ed7837
-=======
   revision: 0a5a15b88bffbe5efad7ff2a072ec4fe6eb09511
->>>>>>> master
   specs:
     activeadmin (1.0.0.pre4)
       arbre (~> 1.0, >= 1.0.2)
@@ -78,12 +74,7 @@
       thor (~> 0.19)
     builder (3.2.2)
     byebug (9.0.5)
-<<<<<<< HEAD
-    cancancan (1.15.0)
-    capybara (2.8.0)
-=======
     capybara (2.8.1)
->>>>>>> master
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
diff --git a/app/views/layouts/_dmponline_org_branding.html.erb b/app/views/layouts/_dmponline_org_branding.html.erb
index e91e51a..7c436ff 100644
--- a/app/views/layouts/_dmponline_org_branding.html.erb
+++ b/app/views/layouts/_dmponline_org_branding.html.erb
@@ -1,7 +1,7 @@
 <!-- Org branding info -->
 <div class="branding_container">
 	<% if user_signed_in? %>
-		<% if !current_user.organisation.present? %>
+		<% if !current_user.organisation.nil? %>
 			<!-- Organisation Logo -->
       <% if current_user.organisation.logo.present? %>
 				<div class="header_org_logo">