Local changes to SQLite, Views and URLS
Resolving local conflicts