fix merge error

Signed-off-by: flar2 <asegaert@gmail.com>