schedules working
fixed conflicts