upmerge view 2