diff --git a/boa_engine/src/object/jsobject.rs b/boa_engine/src/object/jsobject.rs
index 4f1b2f4809b..eebbc6d7dd0 100644
--- a/boa_engine/src/object/jsobject.rs
+++ b/boa_engine/src/object/jsobject.rs
@@ -336,7 +336,7 @@ impl JsObject {
     }
 
     /// Checks if it is a `Set` object
-    ///
+    /// 
     /// # Panics
     ///
     /// Panics if the object is currently mutably borrowed.
diff --git a/boa_engine/src/object/jsset.rs b/boa_engine/src/object/jsset.rs
index e2f3cc68ed0..5b141c4e300 100644
--- a/boa_engine/src/object/jsset.rs
+++ b/boa_engine/src/object/jsset.rs
@@ -4,11 +4,15 @@ use boa_gc::{Finalize, Trace};
 
 use crate::{
     builtins::Set,
+<<<<<<< HEAD
 <<<<<<< HEAD
     object::{JsFunction, JsObject, JsObjectType, JsSetIterator},
 =======
     object::{JsObject, JsObjectType},
 >>>>>>> 5b5551f2b6 (Safe wrapper for `JsSet`)
+=======
+    object::{JsFunction, JsObject, JsObjectType, JsSetIterator},
+>>>>>>> 5adeddf912 (Add `entries()`, `values()`, `keys()`, and `JsSetIterator` wrapper)
     Context, JsResult, JsValue,
 };
 
@@ -139,6 +143,9 @@ impl JsSet {
     }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 5adeddf912 (Add `entries()`, `values()`, `keys()`, and `JsSetIterator` wrapper)
     /// Returns a new iterator object that yields the values
     /// for each element in the Set object in insertion order.
     ///
diff --git a/boa_engine/src/object/mod.rs b/boa_engine/src/object/mod.rs
index a99cee9c533..31ee6bc0c3b 100644
--- a/boa_engine/src/object/mod.rs
+++ b/boa_engine/src/object/mod.rs
@@ -69,9 +69,13 @@ mod jsobject;
 mod jsproxy;
 mod jsset;
 <<<<<<< HEAD
+<<<<<<< HEAD
 mod jsset_iterator;
 =======
 >>>>>>> 5b5551f2b6 (Safe wrapper for `JsSet`)
+=======
+mod jsset_iterator;
+>>>>>>> 5adeddf912 (Add `entries()`, `values()`, `keys()`, and `JsSetIterator` wrapper)
 mod jstypedarray;
 mod operations;
 mod property_map;
@@ -83,9 +87,13 @@ pub use jsmap_iterator::*;
 pub use jsproxy::*;
 pub use jsset::*;
 <<<<<<< HEAD
+<<<<<<< HEAD
 pub use jsset_iterator::*;
 =======
 >>>>>>> 5b5551f2b6 (Safe wrapper for `JsSet`)
+=======
+pub use jsset_iterator::*;
+>>>>>>> 5adeddf912 (Add `entries()`, `values()`, `keys()`, and `JsSetIterator` wrapper)
 pub use jstypedarray::*;
 
 pub(crate) trait JsObjectType: