minor changes
fixed merge issue