diff --git a/app/models/project.rb b/app/models/project.rb
index f14719630cf..13fd383237c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -821,7 +821,6 @@ class Project < ActiveRecord::Base
     end
   end
 
-<<<<<<< HEAD
   def any_runners?(&block)
     if runners.active.any?(&block)
       return true