fix conflict product update view