add a vim diffconflicts tools