conflict bug fix attempt
update styles