update
fix conflict
added .gitignore to ignore eshell/