fixed errors from merge