sort paragraphs in vim
git merge strategies