live logo update
conflict resolved