Very slight changes.
Merge conflict - just whitespace formatting.