cool logo
fix conflicts