fixed the merge issue