diff --git a/app/views/questions/_show_question.html.erb b/app/views/questions/_show_question.html.erb
index 482edb9..9da57b9 100644
--- a/app/views/questions/_show_question.html.erb
+++ b/app/views/questions/_show_question.html.erb
@@ -59,9 +59,6 @@
     </div>
     <div class="row">
       <div class="col-md-12">
-<<<<<<< 436bb9e6a6a98b57d656f4bf89e90ff2aeb884f5
-        <% if (question.modifiable) %>
-=======
         <!-- Add suggested or example answers to a funders template-->
         <% example_answer = question.get_example_answer(current_user.org_id) %>
         <% guidance = question.get_guidance_annotation(current_user.org_id) %>
@@ -80,7 +77,6 @@
         <% end %>
         <div class="pull-right">
           <% if (question.modifiable) %>
->>>>>>> added template customization back in #791
             <%= link_to _('Edit question'), "#question_edit#{question.id}", class: "btn btn-default question_edit_link", role: "button" %>
             <%= link_to _('Delete question'), admin_destroy_question_path(question_id: question.id),
               confirm: _("You are about to delete '%{question_text}'. Are you sure?") % { :question_text => question.text }, method: :delete, class: "btn btn-default", role:"button" %>
@@ -95,11 +91,7 @@
               </div>
             <% end %>
           <% end %>
-<<<<<<< 436bb9e6a6a98b57d656f4bf89e90ff2aeb884f5
-        <% end %>
-=======
         </div>
->>>>>>> added template customization back in #791
       </div>
     </div>
   </div>