add vim2hs
fix conflict