added rake schedules
fixed merge conflicts for style