update view
fixed merge