manufacturing a conflict, second try
after kdiff3