Chnages in child_stat for date_format
Fix merge conflicts