Yet more merge conflict fixes.