some nice styling
conflict resolved