More merge conflict fixes.