Fix conflict in app/views/admin/conversational_development_index/show.html.haml

app/views/admin/conversational_development_index/show.html.haml

@@ -25,11 +25,7 @@
         - @metric.cards.each do |card|
           = render 'card', card: card
 
-<<<<<<< HEAD
-      .convdev-steps.d-none.d-lg-block
-=======
       .convdev-steps.d-none.d-lg-block.d-xl-block
->>>>>>> gitlab-ce/master
         - @metric.idea_to_production_steps.each_with_index do |step, index|
           .convdev-step{ class: "convdev-#{score_level(step.percentage_score)}-score" }
             = custom_icon("i2p_step_#{index + 1}")