MacPro Initial Commit
Spacing and capitalization updates
Handling conflicts