Minor merge conflict fixes.