logo attempts
fixed merge conflicts