updates
merge
remove view files