add quasi upsert
merge master