Merging Lots of Changes