updated submodule couchdb, fixed merge resolution error from last merge