Massive merges, figuring out alignment automagically.