conflict styling solved