never trust a kdiff3 merge ...