fixed merge issues...whatever

Signed-off-by: gormed <hans.ferchland@gmx.de>