merged + logo
merge