refactor dotvim
fix merge