resolved lost js
solve merge conflicts