Transparent logo
Conflicts resolved