(#740) - fix #732 websql conflicts regression
(#740) - fix #732 websql conflicts regression

tohagan/pouchdb,h4ki/pouchdb,Charlotteis/pouchdb,nicolasbrugneaux/pouchdb,mwksl/pouchdb,yaronyg/pouchdb,lakhansamani/pouchdb,janl/pouchdb,KlausTrainer/pouchdb,cesarmarinhorj/pouchdb,bbenezech/pouchdb,microlv/pouchdb,patrickgrey/pouchdb,p5150j/pouchdb,yaronyg/pouchdb,garrensmith/pouchdb,asmiller/pouchdb,HospitalRun/pouchdb,microlv/pouchdb,h4ki/pouchdb,Charlotteis/pouchdb,mwksl/pouchdb,microlv/pouchdb,p5150j/pouchdb,crissdev/pouchdb,Knowledge-OTP/pouchdb,willholley/pouchdb,colinskow/pouchdb,ramdhavepreetam/pouchdb,cdaringe/pouchdb,greyhwndz/pouchdb,garrensmith/pouchdb,lukevanhorn/pouchdb,marcusandre/pouchdb,nickcolley/pouchdb,nickcolley/pouchdb,optikfluffel/pouchdb,cesarmarinhorj/pouchdb,spMatti/pouchdb,pouchdb/pouchdb,ramdhavepreetam/pouchdb,tohagan/pouchdb,shimaore/pouchdb,TechnicalPursuit/pouchdb,greyhwndz/pouchdb,colinskow/pouchdb,seigel/pouchdb,cesarmarinhorj/pouchdb,slaskis/pouchdb,shimaore/pouchdb,slang800/pouchdb,yaronyg/pouchdb,daleharvey/pouchdb,marcusandre/pouchdb,mattbailey/pouchdb,nickcolley/pouchdb,mattbailey/pouchdb,mainerror/pouchdb,Actonate/pouchdb,janraasch/pouchdb,adamvert/pouchdb,pouchdb/pouchdb,callahanchris/pouchdb,cdaringe/pouchdb,ntwcklng/pouchdb,mainerror/pouchdb,janl/pouchdb,janraasch/pouchdb,Actonate/pouchdb,colinskow/pouchdb,pouchdb/pouchdb,mikeymckay/pouchdb,patrickgrey/pouchdb,slang800/pouchdb,seigel/pouchdb,crissdev/pouchdb,lakhansamani/pouchdb,mikeymckay/pouchdb,tyler-johnson/pouchdb,h4ki/pouchdb,shimaore/pouchdb,lakhansamani/pouchdb,willholley/pouchdb,slang800/pouchdb,greyhwndz/pouchdb,KlausTrainer/pouchdb,ramdhavepreetam/pouchdb,cdaringe/pouchdb,asmiller/pouchdb,elkingtonmcb/pouchdb,garrensmith/pouchdb,asmiller/pouchdb,adamvert/pouchdb,HospitalRun/pouchdb,TechnicalPursuit/pouchdb,jhs/pouchdb,p5150j/pouchdb,mainerror/pouchdb,bbenezech/pouchdb,KlausTrainer/pouchdb,Dashed/pouchdb,elkingtonmcb/pouchdb,tyler-johnson/pouchdb,Knowledge-OTP/pouchdb,Dashed/pouchdb,bbenezech/pouchdb,patrickgrey/pouchdb,mattbailey/pouchdb,spMatti/pouchdb,nicolasbrugneaux/pouchdb,johnofkorea/pouchdb,cshum/pouchdb,slaskis/pouchdb,Dashed/pouchdb,elkingtonmcb/pouchdb,nicolasbrugneaux/pouchdb,optikfluffel/pouchdb,adamvert/pouchdb,HospitalRun/pouchdb,Actonate/pouchdb,willholley/pouchdb,ntwcklng/pouchdb,jhs/pouchdb,crissdev/pouchdb,marcusandre/pouchdb,evidenceprime/pouchdb,tyler-johnson/pouchdb,johnofkorea/pouchdb,Charlotteis/pouchdb,seigel/pouchdb,cshum/pouchdb,optikfluffel/pouchdb,callahanchris/pouchdb,daleharvey/pouchdb,lukevanhorn/pouchdb,mikeymckay/pouchdb,cshum/pouchdb,daleharvey/pouchdb,janraasch/pouchdb,Knowledge-OTP/pouchdb,callahanchris/pouchdb,janl/pouchdb,lukevanhorn/pouchdb,johnofkorea/pouchdb,spMatti/pouchdb,mwksl/pouchdb,ntwcklng/pouchdb,jhs/pouchdb,TechnicalPursuit/pouchdb,slaskis/pouchdb,tohagan/pouchdb