Merge conflict fixes.