added eshell aliases
fixed merge