Conflict resolution.
Whitespace fixes.