styling chnages
conflict resolved