ex6 -> ex7
merge