Support for query logging in development
Pulling and conflict resolution