resolved conflicts
emacs - added dired commands