added logo
fix merge conflicts