(#2072) WIP - get websql working with new conflicts tests