fixed errors from merge conflict