vimwiki
resolves conflict