typo fix

fixed merge