Adjusted errors from merge