fixed merge end typo