fix to merge issue?