change:add logo image
change: fixed conflict