More merge conflicts fixed