One more merge conflict solved