set load-path uniformly
fix merge conflict in .emacs