js added
garbage cleaning
fix merge conflict