git-annex automatic merge conflict fix
emacs: orgmode
sync
Merge branch 'master' of https://github.com/xiaoruoruo/dotfiles