Added logo
script merge conflict