add in logo
conflict resolution
added logo