mikes views
fixed new view conflict
fixed index merge conflict