updated logo section
fixed merge conflicts