fix errors from merge