manual merges of a few classes that couldn't easily be merged with the "normal" diff merger