Styles
Conflict resolved