Merge fixed typo