some more merge fixes