butt-load of merges and stuff