merge
fix js bug