One more merge conflict