for merger
add logo
fix conflict