ugh.  Twenty minutes after a merge, things are _Starting_ to work