Resolve merge conflict
Use SQLite for development by default