fixed typo during merge