new vimwikis
fix merge conflicts