new logo
fixed merge conflict