merge whitespace fixes