Update schedule.rb
fix merge conflict