fixing merge issue