White space and merge cleanup.
1 file changed