add views
merge