CSS master merge