Merge and typo