Fix errors from merge conflict