Conflict styling changes.