ficxed typo merge