Fixed typo of last merge