css changes
conflict resolved