edit gitignore
fix js
fix confilcts