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