merged css changes