fixed logo
merged conflicts