health checks

db/seeds/health_check.seeds.rb

@@ -52,11 +52,7 @@ if !RundeckJob.where(job_name:"health_report").last.blank?
         end
     end
     if !HealthCheck.last.blank?
-<<<<<<< HEAD
         if HealthCheck.last.status == "unhealthy"
-=======
-        if HealthCheck.last.status != "healthy"
->>>>>>> seed
             check_run_alerts()
             RundeckHelper.post_compositional_role
             return 0