FIXED some merge conflicts.

Signed-off-by: Michael Grammling <m.grammling@external.telekom.de>