merge can now be used for upserts