More merge conflict code.