'merging' joao changes