model chnages
conflicts resolved