diff --git a/test/main.h b/test/main.h
index 84e121aa0..18bb5c825 100644
--- a/test/main.h
+++ b/test/main.h
@@ -67,40 +67,16 @@
 // protected by parenthesis against macro expansion, the min()/max() macros
 // are defined here and any not-parenthesized min/max call will cause a
 // compiler error.
-<<<<<<< local
 #define min(A,B) please_protect_your_min_with_parentheses
 #define max(A,B) please_protect_your_max_with_parentheses
 #define isnan(X) please_protect_your_isnan_with_parentheses
 #define isinf(X) please_protect_your_isinf_with_parentheses
 #define isfinite(X) please_protect_your_isfinite_with_parentheses
-=======
-#if !defined(__HIPCC__) && !defined(EIGEN_USE_SYCL)
-  //
-  // HIP header files include the following files
-  //  <thread>
-  //  <regex>
-  //  <unordered_map>
-  // which seem to contain not-parenthesized calls to "max"/"min", triggering the following check and causing the compile to fail
-  //
-  // Including those header files before the following macro definition for "min" / "max", only partially resolves the issue
-  // This is because other HIP header files also define "isnan" / "isinf" / "isfinite" functions, which are needed in other
-  // headers.
-  //
-  // So instead choosing to simply disable this check for HIP
-  //
-  #define min(A,B) please_protect_your_min_with_parentheses
-  #define max(A,B) please_protect_your_max_with_parentheses
-  #define isnan(X) please_protect_your_isnan_with_parentheses
-  #define isinf(X) please_protect_your_isinf_with_parentheses
-  #define isfinite(X) please_protect_your_isfinite_with_parentheses
-#endif
-
 
 // test possible conflicts
 struct real {};
 struct imag {};
 
->>>>>>> graft
 #ifdef M_PI
 #undef M_PI
 #endif