added vimdiff
adapted vim