Better conflict management and formatting fixes.
Merge remote-tracking branch 'origin/master'