try to fix conflict

Signed-off-by: Cthulhux <git@tuxproject.de>