More merge conflict fixes