Fix conflicts

app/views/projects/blob/_editor.html.haml

@@ -6,14 +6,9 @@
       = sprite_icon('fork', size: 12)
       = ref
     - if current_action?(:edit) || current_action?(:update)
-<<<<<<< HEAD
-      = text_field_tag 'file_path', (params[:file_path] || @path),
-                                    class: 'form-control new-file-path js-file-path-name-input'
-=======
       %span.editor-file-name
         = text_field_tag 'file_path', (params[:file_path] || @path),
                                       class: 'form-control new-file-path js-file-path-name-input'
->>>>>>> upstream/master
 
     - if current_action?(:new) || current_action?(:create)
       %span.editor-file-name

changelogs/unreleased/50126-blocked-user-card.yml

 ---
 title: Fix blocked user card style
-<<<<<<< HEAD
-merge_request: 6849
-=======
 merge_request: 21095
->>>>>>> upstream/master
 author:
 type: fixed