Updating app and adding views
Fixing merge conflicts