* fixed merge issue