small changes
fixing merge issue