Update styles
Fix conflict