remove merge problem.

Signed-off-by: David Hoffmann <david@hoffmann-projcts.de>