logos and stuff
fix conflicts