correction: merge issue