correct views, merge to overwrite origin master