second fix on that merge issue