Whoops. merge conlicts fixed.