Fix _with_tabs.html.haml conflict

app/views/projects/pipelines/_with_tabs.html.haml

@@ -84,7 +84,6 @@
                 %pre.build-trace.build-trace-rounded
                   %code.bash.js-build-output
                     = build_summary(build)
-<<<<<<< HEAD
   - if expose_sast_data || expose_dependency_data
     #js-tab-security.build-security.tab-pane
       #js-security-report-app{ data: { endpoint: expose_sast_data ? sast_artifact_url(@pipeline) : nil,
@@ -95,6 +94,3 @@
       vulnerability_feedback_help_path: help_page_path("user/project/merge_requests/index", anchor: "interacting-with-security-reports-ultimate"),
       sast_help_path: help_page_path('user/project/merge_requests/sast'),
       dependency_scanning_help_path: help_page_path('user/project/merge_requests/dependency_scanning')} }
-=======
-
->>>>>>> upstream/master