cleanin
update product
works
View product
merge