css path update
conflict resolved