upmerge view 3