Bugfix: Specify styles that conflict with other styles
Merge pull request #466 from NMarrero/master

Bugfix: Specify styles that conflict with other styles