add snapshot
merge