views
Resolved conflict
views in the project