(#2072) - Additional tests of conflict resolution, fix idb/leveldb
(#2072) - Simplify idb conflict code, fix websql