upmerge view 1