Modify Styles
conflix test
Merge pull request #1 from Kebie/conflict_styles

Conflict styles