Typo during merge