Added conflict resolution policy.

It isn't used yet.
Updated tests to prevent multiple poll sequences.

Also handled Drive change request errors.
Added local-to-remote update batching.