fix up more merge problems