logo changes
fixed merge conflict