More merge conflicts resolved