Remove trailing whitespace
Change space indentation to tabs
Merge conflicts