gh-92810: Fix merge conflicts

Author: dolfinus

Include/internal/pycore_pyatomic_ft_wrappers.h

@@ -75,6 +75,8 @@ 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)
+#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) \
@@ -172,6 +174,7 @@ 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
+#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)