gh-92810: Fix merge conflicts

Author: dolfinus

Include/internal/pycore_pyatomic_ft_wrappers.h

@@ -49,11 +49,8 @@ extern "C" {
     _Py_atomic_load_uint16_relaxed(&value)
 #define FT_ATOMIC_LOAD_UINT32_RELAXED(value) \
     _Py_atomic_load_uint32_relaxed(&value)
-<<<<<<< improvement/ABCMeta_subclasscheck
-=======
 #define FT_ATOMIC_LOAD_UINT64_ACQUIRE(value) \
     _Py_atomic_load_uint64_acquire(&value)
->>>>>>> main
 #define FT_ATOMIC_LOAD_UINT64_RELAXED(value) \
     _Py_atomic_load_uint64_relaxed(&value)
 #define FT_ATOMIC_LOAD_ULONG_RELAXED(value) \
@@ -78,17 +75,12 @@ extern "C" {
     _Py_atomic_store_uint16_relaxed(&value, new_value)
 #define FT_ATOMIC_STORE_UINT32_RELAXED(value, new_value) \
     _Py_atomic_store_uint32_relaxed(&value, new_value)
-<<<<<<< improvement/ABCMeta_subclasscheck
-#define FT_ATOMIC_STORE_UINT64_RELAXED(value, new_value) \
-    _Py_atomic_store_uint64_relaxed(&value, new_value)
-=======
 #define FT_ATOMIC_AND_UINT64(value, new_value) \
     (void)_Py_atomic_and_uint64(&value, new_value)
 #define FT_ATOMIC_OR_UINT64(value, new_value) \
     (void)_Py_atomic_or_uint64(&value, new_value)
 #define FT_ATOMIC_ADD_UINT64(value, new_value) \
     (void)_Py_atomic_add_uint64(&value, new_value)
->>>>>>> main
 #define FT_ATOMIC_STORE_CHAR_RELAXED(value, new_value) \
     _Py_atomic_store_char_relaxed(&value, new_value)
 #define FT_ATOMIC_LOAD_CHAR_RELAXED(value) \
@@ -167,10 +159,7 @@ extern "C" {
 #define FT_ATOMIC_LOAD_UINT8_RELAXED(value) value
 #define FT_ATOMIC_LOAD_UINT16_RELAXED(value) value
 #define FT_ATOMIC_LOAD_UINT32_RELAXED(value) value
-<<<<<<< improvement/ABCMeta_subclasscheck
-=======
 #define FT_ATOMIC_LOAD_UINT64_ACQUIRE(value) value
->>>>>>> main
 #define FT_ATOMIC_LOAD_UINT64_RELAXED(value) value
 #define FT_ATOMIC_LOAD_ULONG_RELAXED(value) value
 #define FT_ATOMIC_STORE_PTR_RELAXED(value, new_value) value = new_value
@@ -183,13 +172,9 @@ extern "C" {
 #define FT_ATOMIC_STORE_UINT8_RELAXED(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_UINT16_RELAXED(value, new_value) value = new_value
 #define FT_ATOMIC_STORE_UINT32_RELAXED(value, new_value) value = new_value
-<<<<<<< improvement/ABCMeta_subclasscheck
-#define FT_ATOMIC_STORE_UINT64_RELAXED(value, new_value) value = new_value
-=======
 #define FT_ATOMIC_AND_UINT64(value, new_value) (void)(value &= new_value)
 #define FT_ATOMIC_OR_UINT64(value, new_value) (void)(value |= new_value)
 #define FT_ATOMIC_ADD_UINT64(value, new_value) (void)(value += new_value)
->>>>>>> main
 #define FT_ATOMIC_LOAD_CHAR_RELAXED(value) value
 #define FT_ATOMIC_STORE_CHAR_RELAXED(value, new_value) value = new_value
 #define FT_ATOMIC_LOAD_UCHAR_RELAXED(value) value