update style guide
attempting merge conflict workaround
redo todo to resolve conflict