diff --git a/lib/internal/validators.js b/lib/internal/validators.js
index 1b17fb68e..f9e6e5559 100644
--- a/lib/internal/validators.js
+++ b/lib/internal/validators.js
@@ -125,11 +125,7 @@ const validateUint32 = hideStackFrames((value, name, positive = false) => {
   }
   const min = positive ? 1 : 0
   // 2 ** 32 === 4294967296
-<<<<<<< HEAD
   const max = 4294967295
-=======
-  const max = 4_294_967_295
->>>>>>> 6efcd35 (chore: just build to fix whitespace issues (#498))
   if (value < min || value > max) {
     throw new ERR_OUT_OF_RANGE(name, `>= ${min} && <= ${max}`, value)
   }