kdiff3 after corrections