fixed merge issue