Fixed merge issue

Fixed merge issue