Fix rebase issues

CHANGELOG.md

@@ -5,6 +5,9 @@
 ### Features
 - **Breaking Change**: upgrade `ArgumentValidationError` and replace `UnauthorizedError` and `ForbiddenError` with `AuthenticationError`, `AuthorizationError` that are extending `GraphQLError` to let the error details be accessible in the `extensions` property
 - **Breaking Change**: change `ClassType` constraint from `ClassType<T = any>` to `ClassType<T extends object = object>` in order to make it work properly with new TS features
+- **Breaking Change**: removed `dateScalarMode` option from `buildSchema`
+- **Breaking Change**: make `graphql-scalars` package a peer dependency and use date scalars from it instead of custom ones
+- **Breaking Change**: exported `GraphQLISODateTime` scalar has now a name `DateTimeISO`
 
 ## v2.0.0-beta.2
 ### Features
@@ -13,9 +16,6 @@
 - **Breaking Change**: `buildSchemaSync` is now also checking the generated schema for errors
 - **Breaking Change**: `validate` option of `buildSchema` is set to `false` by default - integration with `class-validator` has to be turned on explicitly
 - **Breaking Change**: `validate` option of `buildSchema` doesn't accept anymore a custom validation function - use `validateFn` option instead
-- **Breaking Change**: removed `dateScalarMode` option from `buildSchema`
-- **Breaking Change**: make `graphql-scalars` package a peer dependency and use date scalars from it instead of custom ones
-- **Breaking Change**: exported `GraphQLISODateTime` scalar has now a name `DateTimeISO`
 - support class-based auth checker, which allows for dependency injection
 - allow defining directives for interface types and theirs fields, with inheritance for object types fields (#744)
 - allow deprecating input fields and args (#794)