update logo
update logo
refactor
merage