Fix merge conflict in variables.css