Fix integration schedule
fix conflict merge