Update add back linter and diff