changes in gitignore
resolved conflicts
removed views
file changes
file changes