add like commic babystep
add like comic ace of dia
fix conflict