fixed merge issue in main text