csschanges for logo
fixed merge conflicts
fixed merge conflicts