add vim conf
mergy