emacs indentation config
merging conflicts