Fix compilation error from merges