merge desy local conflict
add reference. improve text