insert logo
insert logo and fix merge