fix the merge issue