fixed merge issue in main scholia