adding logo
fixing conflict