fixed errors from the merge