fixed js file
solve merge conflit