From 90e9d3c90fbedae4b915be320e1837cd6d25ee1d Mon Sep 17 00:00:00 2001
From: Daniel Lemire <daniel@lemire.me>
Date: Thu, 31 Jul 2025 13:08:21 -0400
Subject: [PATCH] fix

---
 .../static_reflection_builder_tests.cpp       | 60 -------------------
 1 file changed, 60 deletions(-)

diff --git a/tests/builder/static_reflection_builder_tests.cpp b/tests/builder/static_reflection_builder_tests.cpp
index 77462a38a..5034090a4 100644
--- a/tests/builder/static_reflection_builder_tests.cpp
+++ b/tests/builder/static_reflection_builder_tests.cpp
@@ -96,65 +96,6 @@ namespace builder_tests {
   #endif // SIMDJSON_EXCEPTIONS
 
 
-<<<<<<< HEAD
-  bool serialize_deserialize_kid() {
-    TEST_START();
-    simdjson::padded_string json_str =
-        R"({"age": 12, "name": "John", "toys": ["car", "ball"]})"_padded;
-    simdjson::ondemand::parser parser;
-    simdjson::ondemand::document doc;
-    ASSERT_SUCCESS(parser.iterate(json_str).get(doc));
-    kid k;
-    ASSERT_SUCCESS(doc.get<kid>().get(k));
-    ASSERT_EQUAL(k.age, 12);
-    ASSERT_EQUAL(k.name, "John");
-    ASSERT_EQUAL(k.toys.size(), 2);
-    ASSERT_EQUAL(k.toys[0], "car");
-    ASSERT_EQUAL(k.toys[1], "ball");
-    // Now, go the other direction:
-    std::string json;
-    ASSERT_SUCCESS(simdjson::builder::to_json_string(k).get(json));
-    std::cout << json << std::endl;
-    // Now we parse it back:
-    simdjson::ondemand::parser parser2;
-    simdjson::ondemand::document doc2;
-    ASSERT_SUCCESS(parser2.iterate(simdjson::pad(json)).get(doc2));
-    kid k2;
-    ASSERT_SUCCESS(doc2.get<kid>().get(k2));
-    ASSERT_EQUAL(k2.age, 12);
-    ASSERT_EQUAL(k2.name, "John");
-    ASSERT_EQUAL(k2.toys.size(), 2);
-    ASSERT_EQUAL(k2.toys[0], "car");
-    ASSERT_EQUAL(k2.toys[1], "ball");
-    TEST_SUCCEED();
-  }
-
-  bool serialize_deserialize_x_y_z() {
-    TEST_START();
-    X s1 = {.a = '1',
-            .b = 10,
-            .c = 0,
-            .d = "test string\n\r\"",
-            .e = {1, 2, 3},
-            .f = {"ab", "cd", "fg"},
-            .y = {.g = 100,
-                  .h = "test string\n\r\"",
-                  .i = {1, 2, 3},
-                  .z = {.x = 1000}}};
-    std::string pstr;
-    ASSERT_SUCCESS(simdjson::builder::to_json_string(s1).get(pstr));
-    ASSERT_EQUAL(
-        pstr,
-        R"({"a":"1","b":10,"c":0,"d":"test string\n\r\"","e":[1,2,3],"f":["ab","cd","fg"],"y":{"g":100,"h":"test string\n\r\"","i":[1,2,3],"z":{"x":1000}}})");
-    simdjson::ondemand::parser parser;
-    simdjson::ondemand::document doc;
-    ASSERT_SUCCESS(parser.iterate(simdjson::pad(pstr)).get(doc));
-    X s2;
-    ASSERT_SUCCESS(doc.get<X>().get(s2));
-    ASSERT_TRUE(s1 == s2);
-    TEST_SUCCEED();
-  }
-=======
 bool serialize_deserialize_kid() {
   TEST_START();
 #if SIMDJSON_STATIC_REFLECTION
@@ -216,7 +157,6 @@ bool serialize_deserialize_x_y_z() {
 #endif
   TEST_SUCCEED();
 }
->>>>>>> master
 
   bool run() {
     return