Formatting and whitespace fixes
Add section on merge conflicts