Fix error missed in merge resolution.