Resolve conflicts in lib/gitlab/slash_commands/command.rb

lib/gitlab/slash_commands/command.rb

@@ -5,13 +5,9 @@ module Gitlab
         Gitlab::SlashCommands::IssueShow,
         Gitlab::SlashCommands::IssueNew,
         Gitlab::SlashCommands::IssueSearch,
-<<<<<<< HEAD
+        Gitlab::SlashCommands::IssueMove,
         Gitlab::SlashCommands::Deploy,
         Gitlab::SlashCommands::Run
-=======
-        Gitlab::SlashCommands::IssueMove,
-        Gitlab::SlashCommands::Deploy
->>>>>>> upstream/master
       ].freeze
 
       def execute