Convert tabs to two spaces across all
Fix merge conflict and update spacing across all