work on views
merge