all views
merge fix