updating css
mergin