added ugly hack for vimdiff git merging