blobsql merge conflicts