Adding logo
Fixing conflict