fix bug and releas version 2.0
fix merge conflict
add new notes