merging from iriscouch