Ok, actually do that merge properly.