Fix compilation after merge