fixed typo when merging