fix merge
fix merge conflict
solve todo1 in js