Putting the deep merge together