inline pandoc editing in vim
merge fixing