Update styles
Resolve merge