merge conflict fixes.