Fixing bad merge that broke CSS