co,mitting model generatir
merged stuff