minor formatting
manual merge resolving whitespace