Fix typo in last commit
Merge