mergin f5 data to master
conflict at schedule and cron resolved