fixing cron schedule
fixed merge errors