Some more merge conflicts