merg with logo fix
i think it worked