Tabs => spaces
Nuking trailing spaces
Cleaned up conflicts after tab to space conversion