Tweaks
Remind me not to take on hand formatting a file like this again.
Settings.xml Conflict resolution

Pulled latest Settings.xml and resolved conflicts.