add some emacs config
resolve merge conflicts
display line numbers on left margin