modify my emacs config file
conflict
add my emacs config