Fix unresolved merge conflicts.
Another merge fix.