diff --git a/lib/puma/cluster.rb b/lib/puma/cluster.rb
index 69eb059da4..24f4ea5f85 100644
--- a/lib/puma/cluster.rb
+++ b/lib/puma/cluster.rb
@@ -74,10 +74,6 @@ def initialize(idx, pid, phase, options)
         @started_at = Time.now
         @last_checkin = Time.now
         @last_status = '{}'
-<<<<<<< HEAD
-=======
-        @dead = false
->>>>>>> Fixes Cluster worker shutdown/restart (#1908)
         @term = false
       end