merge all update status bug fix