finish it age group
fix conflict
fix merge conflict