more merge fixes.