Files had errors from rebase