updated views
merging