fix spelling error in merge