change models
fix conflicts