@@ -1687,7 +1687,7 @@ changes:
   * `end` {integer} **Default:** `Infinity`
   * `highWaterMark` {integer} **Default:** `64 * 1024`
   * `fs` {Object|null} **Default:** `null`
-* Returns: {fs.ReadStream} See [Readable Streams][].
+* Returns: {fs.ReadStream} See [Readable Stream][].
 
 Unlike the 16 kb default `highWaterMark` for a readable stream, the stream
 returned by this method has a default `highWaterMark` of 64 kb.
 
@@ -11,13 +11,9 @@ const {
 } = primordials;
 
 const {
-<<<<<<< HEAD
+  ERR_INVALID_ARG_TYPE,
   ERR_OUT_OF_RANGE,
   ERR_STREAM_DESTROYED
-=======
-  ERR_INVALID_ARG_TYPE,
-  ERR_OUT_OF_RANGE
->>>>>>> fixup: linting
 } = require('internal/errors').codes;
 const internalUtil = require('internal/util');
 const { validateNumber } = require('internal/validators');