one more merge fix