resolve confict, added logo