Updated logo
recommit logo update
resolved merge conflict