whitespace: cleaning up messy rebase/merge