More merge conflicts