fixed code merge issue