fixed merge issue from commit