Fix conflicts for...

Fix conflicts for app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue [ci skip]

app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue

@@ -109,7 +109,6 @@ export default {
           </template>
 
           <span class="mr-widget-pipeline-graph">
-<<<<<<< HEAD
             <span class="stage-cell">
               <linked-pipelines-mini-list
                 v-if="triggeredBy.length"
@@ -132,19 +131,6 @@ export default {
                 v-if="triggered.length"
                 :triggered="triggered"
               />
-=======
-            <span
-              v-if="hasStages"
-              class="stage-cell"
-            >
-              <div
-                v-for="(stage, i) in pipeline.details.stages"
-                :key="i"
-                class="stage-container dropdown js-mini-pipeline-graph"
-              >
-                <pipeline-stage :stage="stage" />
-              </div>
->>>>>>> upstream/master
             </span>
           </span>