Resolve merge conflict
Hover added to logo
Merge conflict
Resolve merge conflict (FINALLY)