change views
merge