Fix compilation issue related to merge