more merge fix

more merge fix