solve conflict

Signed-off-by: kellnerk <karel@kellner.be>