view 2 update

test merger