Correct errors from merge