merge model changes