diff --git a/app/views/analyze/_grouped_bar_column.html.erb b/app/views/analyze/_grouped_bar_column.html.erb
index f56894de..17bce6f4 100644
--- a/app/views/analyze/_grouped_bar_column.html.erb
+++ b/app/views/analyze/_grouped_bar_column.html.erb
@@ -17,31 +17,11 @@
 
       <% if ENV["SCORES"].present?  && ENV["SCORES"].upcase == "SHOW" %>
         <text x="<%= bar.x_position + (column.bar_width * 0.5) %>%" y="<%= score_label_y[index] %>%" text-anchor="middle" dominant-baseline="middle">
-<<<<<<< Updated upstream
-          <%= bar.average %>
-        </text>
-      <% end %>
-
-    <% end %>
-  <% end %>
-
-  <line x1="<%= column.column_start_x %>%" y1="0" x2="<%= column.column_start_x %>%" y2="85%" stroke="grey" stroke-width="1" stroke-dasharray="5,2" />
-||||||| constructed merge base
-          <%= bar.average %>
-        </text>
-      <% end %>
-
-    <% end %>
-  <% end %>
-
-  <line x1="<%= column.column_start_x %>%" y1="0" x2="<%= column.column_start_x %>%" y2="85%" stroke="grey" stroke-width="1" stroke-dasharray="5,2" />
-=======
       <%= bar.average %>
     </text>
   <% end %>
 <% end %>
 <line x1="<%= column.column_start_x %>%" y1="0" x2="<%= column.column_start_x %>%" y2="85%" stroke="grey" stroke-width="1" stroke-dasharray="5,2" />
->>>>>>> Stashed changes
       <% words = column.label %>
       <% words.each_with_index do | line, index | %>
         <text class="graph-footer" x="<%= column.column_midpoint %>%" y="<%= column.bar_label_height + (index * 5) %>%" text-anchor="middle" dominant-baseline="middle" data-grouped-bar-label="<%= column.label %>">