Cleaning merge

Signed-off-by: Arnaud PETIT <arnaud.petit@minesdedouai.fr>