created project views
merge conflict