ignoring the .viminfo
Mergin conflict solved