- Fixing bad merge on stylesheet