8.4 snapshot merge3