diff --git a/clang/lib/Headers/hlsl/hlsl_intrinsics.h b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
--- a/clang/lib/Headers/hlsl/hlsl_intrinsics.h
+++ b/clang/lib/Headers/hlsl/hlsl_intrinsics.h
@@ -13,15 +13,13 @@
 __attribute__((clang_builtin_alias(__builtin_hlsl_wave_active_count_bits))) uint
 WaveActiveCountBits(bool bBit);
 
-<<<<<<< HEAD
-=======
+
 // abs builtins
 __attribute__((clang_builtin_alias(__builtin_abs))) int abs(int In);
 __attribute__((clang_builtin_alias(__builtin_labs))) int64_t abs(int64_t In);
 __attribute__((clang_builtin_alias(__builtin_fabsf))) float abs(float In);
 __attribute__((clang_builtin_alias(__builtin_fabs))) double abs(double In);
 
->>>>>>> cb3f11ce6110 ([HLSL] add sqrt library function)
 #ifdef __HLSL_ENABLE_16_BIT
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 int16_t abs(int16_t);
@@ -40,7 +38,7 @@
 half4 abs(half4);
 #endif
 
-<<<<<<< HEAD
+
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs))) int abs(int);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs))) int2 abs(int2);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs))) int3 abs(int3);
@@ -69,7 +67,7 @@
 double3 abs(double3);
 __attribute__((clang_builtin_alias(__builtin_elementwise_abs)))
 double4 abs(double4);
-=======
+
 // sqrt builtins
 __attribute__((clang_builtin_alias(__builtin_sqrt))) double sqrt(double In);
 __attribute__((clang_builtin_alias(__builtin_sqrtf))) float sqrt(float In);
@@ -77,6 +75,6 @@
 #ifdef __HLSL_ENABLE_16_BIT
 __attribute__((clang_builtin_alias(__builtin_sqrtf16))) half sqrt(half In);
 #endif
->>>>>>> cb3f11ce6110 ([HLSL] add sqrt library function)
+
 
 #endif //_HLSL_HLSL_INTRINSICS_H_