[css-syntax] typos
[css-syntax] resolve conflicts