+ fix gii merge issue