From de586ce91c612ed2da62b017447a81cc7fbefb04 Mon Sep 17 00:00:00 2001
From: Andy Trevorah <andy@trevorah.net>
Date: Wed, 25 Mar 2026 17:03:52 +0000
Subject: [PATCH] Fix merge conflict in readme

Looks like this was accidentally introduced in https://github.com/BridgeAR/safe-stable-stringify/commit/132e76cad22529011f7b517070f5d857dbca7fc1
---
 readme.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/readme.md b/readme.md
index 8f06f3d..0eedc37 100644
--- a/readme.md
+++ b/readme.md
@@ -67,15 +67,9 @@ stringify(circular, ['a', 'b'], 2)
   Circular values and bigint values throw as well in case either option is not
   explicitly defined. Sets and Maps are not detected as well as Symbol keys!
   **Default:** `false`
-<<<<<<< HEAD
-* `safe` {boolean} If `true`, calls to .toJSON() and replacers that throw will
-  return the error message in place of the object instead of throwing.
-  **Default:** `false`
-=======
 * `safe` {boolean} If `true`, calls to .toJSON(), getters, and replacers that
   throw will return the error message in place of the object instead of
   throwing. **Default:** `false`
->>>>>>> fa728c4 (fix: implement safe option for toJSON and make other accesses safe)
 * Returns: {function} A stringify function with the options applied.
 
 ```js