untrack eshell/
fixed confilct