[oujf][vim] fix merge bug.