Whitespace cleanup
resolve conflicts