fix conflicts in spec/features/issues/user_uses_slash_commands_spec.rb

spec/features/issues/user_uses_slash_commands_spec.rb

@@ -127,7 +127,6 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
 
     describe 'toggling the WIP prefix from the title from note' do
       let(:issue) { create(:issue, project: project) }
-<<<<<<< HEAD
 
       it 'does not recognize the command nor create a note' do
         write_note("/wip")
@@ -204,8 +203,6 @@ feature 'Issues > User uses quick actions', feature: true, js: true do
 
           expect(page).to have_content '/clear_weight'
           expect(page).not_to have_content 'Commands applied'
-=======
->>>>>>> 9-4-stable
 
           issue.reload