First conflict merger
Merge pull request #210 from gitcac/style-update

First conflict merger