vim: Fix VCS conflict markers
vim: Remove synstack. (scriptease has zS anyway)