Whitespace fixes to avoid merge conflicts