more merge fixes