fix merge resolution mistake

Signed-off-by: Pierre Tardy <pierre.tardy@intel.com>