merge the difference of used .emacs