fix : CONTRIB-4138


Signed-off-by:Eric Villard <dev@eviweb.fr>
fix merge conflict