Created new branch to resolve conflicts. (mongodb#693)

* Created new branch to resolve conflicts.

* Update source/whats-new.txt

Co-authored-by: Rea Rustagi <[email protected]>

---------

Co-authored-by: Caitlin Davey <[email protected]>
Co-authored-by: Rea Rustagi <[email protected]>

Author: 3 people

source/fundamentals/time-series.txt

@@ -20,8 +20,8 @@ Node.js driver.
 Create a Time Series Collection
 -------------------------------
 
-We recommend that you create a time series collection using the MongoDB Shell. 
-Refer to the :mdb-shell:`MongoDB Shell documentation<>` to learn more. 
+We recommend that you create a time series collection using the MongoDB Shell.
+Learn more about how to install and run the MongoDB Shell in the :mdb-shell:`MongoDB Shell documentation <>`.
 For detailed instructions on creating a time series collection
 using the MongoDB Shell, see our
 :manual:`MongoDB Manual entry on time series collections </core/timeseries-collections/#create-a-time-series-collection>`.

source/whats-new.txt

@@ -366,7 +366,7 @@ New features of the 4.10 {+driver-short+} release include:
          myColl.findOne().then(res => callback(null, res), err => callback(err))
 
   - If you are unable to migrate to Promises in a large codebase, you can
-    use the `{+driver-long+} with optional callback support <https://www.npmjs.com/package/mongodb-legacy>`__ package.
+    use the legacy `{+driver-short+} with optional callback support <https://www.npmjs.com/package/mongodb-legacy>`__.
 
 To learn more, see `v4.10.0 Release Highlights <https://github.com/mongodb/node-mongodb-native/releases/tag/v4.10.0>`__.