logo update
merge fix