gcc build fix of the merge