add diffconflicts for a better mergetool in vim