more merge conflict fix