merge
fix js bug
merge