merge snapshot from Cyrill