added changed logo
fixed merge conflicts