Fix another merge issue.