fixed vimdiff thing