fixup!

Author: benjamingr

doc/api/deprecations.md

@@ -3070,8 +3070,6 @@ Type: End-of-Life
 This error code was removed due to adding more confusion to
 the errors used for value type validation.
 
-<<<<<<< Updated upstream
-=======
 ### DEPXXXX: `process.on('multipleResolves', handler)`
 
 <!-- YAML
@@ -3089,7 +3087,6 @@ Type: Runtime.
 This event was deprecated because it did not work with V8 promise combinators
 which diminished its usefulness.
 
->>>>>>> Stashed changes
 [Legacy URL API]: url.md#legacy-url-api
 [NIST SP 800-38D]: https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf
 [RFC 6066]: https://tools.ietf.org/html/rfc6066#section-3