diff --git a/tests/tap_hold_configurations/chordal_hold/default/config.h b/tests/tap_hold_configurations/chordal_hold/default/config.h
index 6ee76b9922..2ba155df73 100644
--- a/tests/tap_hold_configurations/chordal_hold/default/config.h
+++ b/tests/tap_hold_configurations/chordal_hold/default/config.h
@@ -1,9 +1,5 @@
-<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/default/config.h
 /* Copyright 2022 Vladislav Kucheriavykh
  * Copyright 2024 Google LLC
-========
-/* Copyright 2024 ThanhSon.Mech
->>>>>>>> origin/master:keyboards/trnthsn/e8ghty/halconf.h
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,11 +17,5 @@
 
 #pragma once
 
-<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/default/config.h
 #include "test_common.h"
 #define CHORDAL_HOLD
-========
-#define HAL_USE_SPI TRUE
-
-#include_next <halconf.h>
->>>>>>>> origin/master:keyboards/trnthsn/e8ghty/halconf.h
diff --git a/tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h b/tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h
index 5361770fa9..87094b2fac 100644
--- a/tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h
+++ b/tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h
@@ -1,9 +1,5 @@
-<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h
 /* Copyright 2022 Vladislav Kucheriavykh
  * Copyright 2024 Google LLC
-========
-/* Copyright 2022 QMK
->>>>>>>> origin/master:keyboards/deemen17/de80/halconf.h
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,13 +17,6 @@
 
 #pragma once
 
-<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/hold_on_other_key_press/config.h
 #include "test_common.h"
 #define CHORDAL_HOLD
 #define HOLD_ON_OTHER_KEY_PRESS
-========
-#define HAL_USE_SPI TRUE
-
-#include_next <halconf.h>
-
->>>>>>>> origin/master:keyboards/deemen17/de80/halconf.h
diff --git a/tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h b/tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h
index 8b86147628..4d704c5978 100644
--- a/tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h
+++ b/tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h
@@ -19,11 +19,7 @@
 
 #include "test_common.h"
 
-<<<<<<<< HEAD:tests/tap_hold_configurations/chordal_hold/retro_shift_permissive_hold/config.h
 #define CHORDAL_HOLD
-========
-// place overrides here
->>>>>>>> origin/master:keyboards/unikeyboard/diverge3/keymaps/iso_uk/config.h
 #define PERMISSIVE_HOLD
 
 #define RETRO_SHIFT 2 * TAPPING_TERM