logo to center
conflict resolved