adding vim_cf3
solving conflict