fixed typo errors from merge