fixed merge issue on api module