Add to CSS.
Fix merge conflict.