base: fix up any merge issues