fixed merge issue in CHANGELOG

CHANGELOG.md

 ## 1.19.0
 
 ### Language changes
 
 * The language now allows a trailing comma after the last argument of a call and
  the last parameter of a function declaration. This can make long argument or
  parameter lists easier to maintain, as commas can be left as-is when
  reordering lines. For details, see SDK issue
  [26644](https://github.com/dart-lang/sdk/issues/26644).
 
 ### Tool Changes
 
 * `dartfmt` - upgraded to v0.2.9+1
   * Support trailing commas in argument and parameter lists.
   * Gracefully handle read-only files.
   * About a dozen other bug fixes.
 
 * Pub
+  * Added a `--no-packages-dir` flag to `pub get`, `pub upgrade`, and `pub
+    downgrade`. When this flag is passed, pub will not generate a `packages/`
+    directory, and will remove that directory and any symlinks to it if they
+    exist. Note that this replaces the unsupported `--no-package-symlinks` flag.
+
   * Added the ability for packages to declare a constraint on the [Flutter][]
     SDK:
 
     ```yaml
     environment:
       flutter: ^0.1.2
       sdk: >=1.19.0 <2.0.0
     ```
 
     A Flutter constraint will only be satisfiable when pub is running in the
@@ skipping 18 matching lines @@
     This fixes a crash when publishing packages while using Active Directory.
 
   * Fixed a bug where packages from a hosted HTTP URL were considered the same
     as packages from an otherwise-identical HTTPS URL.
 
   * Fixed timer formatting for timers that lasted longer than a minute.
 
   * Eliminate some false negatives when determining whether global executables
     are on the user's executable path.
 
-* dart2dart (aka `dart2js --output-type=dart`) has been removed (this was
-  deprecated in Dart 1.11)
+* `dart2js`
+  * `dart2dart` (aka `dart2js --output-type=dart`) has been removed (this was deprecated in Dart 1.11).
 
 [Flutter]: https://flutter.io/
 
 ### Dart VM
 
 *   The dependency on BoringSSL has been rolled forward. Going forward, builds
     of the Dart VM including secure sockets will require a compiler with C++11
     support. For details, see the
     [Building wiki page](https://github.com/dart-lang/sdk/wiki/Building).
 
@@ skipping 1122 matching lines @@
     they will keep the Dart process alive until they time out. This fixes the
     handling of persistent connections. Previously, the client would shut down
     immediately after a request.
 
   * **Breaking change:** `HttpServer` no longer compresses all traffic by
     default. The new `autoCompress` property can be set to `true` to re-enable
     compression.
 
 * `dart:isolate`: `Isolate.spawnUri` added the optional `packageRoot` argument,
   which controls how it resolves `package:` URIs.