correcting merge problem

Signed-off-by: Kaylleur <to²@toto.com>