another typo while the merge