Massive merge, part 2.