One more merge conflict fix.