getting css updates
resolved conflicts