[browser-update:styles] - Fix merge conflicts #523