Fix typo merge