Edit styles
fix conflict