forgot to merge the CSS properly