merge conflicts resolved styling missing:
logos