Remove unnecessary whitespace changes
Fix bad merge