Fix compilation error after resolving conflict