add models
fix merge issue