merge problems

Signed-off-by: Malte Sussdorff <malte.sussdorff@cognovis.com>