merging self
merge 2
change before model modification