Fix compilation from merge conflict