diff --git a/app/views/admin/conference/show.html.haml b/app/views/admin/conference/show.html.haml
index 027400a1..fa99b73f 100644
--- a/app/views/admin/conference/show.html.haml
+++ b/app/views/admin/conference/show.html.haml
@@ -30,4 +30,4 @@
       = f.input :sponsor_email, hint: 'This mail id is used by sponsors to contact organizers'
       = f.input :sponsor_description, hint: 'This description will be displayed in sponsor section of splash page'
       = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"}
->>>>>>> Sponsor dashboard added, with sponsor component for splash page
+