merged kdiff3 :D