add model of all type
fix merge