add more info to vim about git conflict type