typo and formatting.
merge