CSS Class Typo in Merge