looking at views
merge confict fixing