merge logo changes