change code in model
fix conflick code