vim: simplify RestorePosition
vim: hl VCS conflict markers