mostly css changes
resolve merge and css