Merge branch 'tc-fix-master' into 'master'

Remove duplicate method

See merge request gitlab-org/gitlab-ee!9200

qa/qa/git/repository.rb

@@ -96,10 +96,6 @@ module QA
         run("git merge #{branch}")
       end
 
-      def merge(branch)
-        run("git merge #{branch}")
-      end
-
       def commits
         run('git log --oneline').to_s.split("\n")
       end