merged upstream and view content