diff --git a/include/hcc_detail/hip_ldg.h b/include/hcc_detail/hip_ldg.h
index 4d128dbb02..4dab90b4e8 100644
--- a/include/hcc_detail/hip_ldg.h
+++ b/include/hcc_detail/hip_ldg.h
@@ -21,16 +21,13 @@ THE SOFTWARE.
 #define HIP_LDG_H
 
 #if __HCC__
-<<<<<<< HEAD
 #include"hip_vector_types.h"
 #include"host_defines.h"
 #if __hcc_workweek__ >= 16164
-=======
 #include"hip/hip_vector_types.h"
 #include"hip/hcc_detail/host_defines.h"
 
 
->>>>>>> 75532471b2d124c4af823e838bf983a20debe6c4
 __device__ char                 __ldg(const char* );
 __device__ char1                __ldg(const char1* );
 __device__ char2                __ldg(const char2* );
@@ -100,14 +97,9 @@ __device__ double2              __ldg(const double2* );
 __device__ double3              __ldg(const double3* );
 __device__ double4              __ldg(const double4* );
 
-<<<<<<< HEAD
 #endif  // __hcc_workweek__
 
 #endif  // __HCC__
 
 #endif  // HIP_LDG_H
-=======
-#endif
 
-#endif
->>>>>>> 75532471b2d124c4af823e838bf983a20debe6c4
diff --git a/src/hip_ldg.cpp b/src/hip_ldg.cpp
index c376e0170a..434c2efdc3 100644
--- a/src/hip_ldg.cpp
+++ b/src/hip_ldg.cpp
@@ -18,7 +18,6 @@ THE SOFTWARE.
 */
 
 #include"hcc_detail/hip_ldg.h"
-<<<<<<< HEAD
 #if __hcc_workweek__ >= 16164
 __device__ char                 __ldg(const char* ptr)
 {
@@ -139,63 +138,36 @@ __device__ long3                __ldg(const long3* ptr)
 }
 
 __device__ long4                __ldg(const long4* ptr)
-=======
-
-__device__ char __ldg(const char* ptr)
-{
-    return *ptr;
-}
-
-__device__ signed char __ldg(const signed char* ptr)
->>>>>>> 75532471b2d124c4af823e838bf983a20debe6c4
 {
     return ptr[0];
 }
 
-<<<<<<< HEAD
 __device__ unsigned long        __ldg(const unsigned long* ptr)
-=======
-__device__ short __ldg(const short* ptr)
->>>>>>> 75532471b2d124c4af823e838bf983a20debe6c4
 {
     return ptr[0];
 }
 
-<<<<<<< HEAD
 
 __device__ long long            __ldg(const long long* ptr)
-=======
-__device__ int __ldg(const int* ptr)
->>>>>>> 75532471b2d124c4af823e838bf983a20debe6c4
 {
     return ptr[0];
 }
 
-<<<<<<< HEAD
 __device__ longlong1            __ldg(const longlong1* ptr)
-=======
-__device__ long long __ldg(const long long* ptr)
->>>>>>> 75532471b2d124c4af823e838bf983a20debe6c4
 {
     return ptr[0];
 }
 
-<<<<<<< HEAD
 __device__ longlong2            __ldg(const longlong2* ptr)
 {
     return ptr[0];
 }
 
 __device__ longlong3            __ldg(const longlong3* ptr)
-=======
-
-__device__ int2 __ldg(const int2* ptr)
->>>>>>> 75532471b2d124c4af823e838bf983a20debe6c4
 {
     return ptr[0];
 }
 
-<<<<<<< HEAD
 __device__ longlong4            __ldg(const longlong4* ptr)
 {
     return ptr[0];
@@ -208,14 +180,10 @@ __device__ unsigned long long   __ldg(const unsigned long long* ptr)
 
 
 __device__ uchar1               __ldg(const uchar1* ptr)
-=======
-__device__ int4 __ldg(const int4* ptr)
->>>>>>> 75532471b2d124c4af823e838bf983a20debe6c4
 {
     return ptr[0];
 }
 
-<<<<<<< HEAD
 __device__ uchar2               __ldg(const uchar2* ptr)
 {
     return ptr[0];
@@ -348,9 +316,4 @@ __device__ double4              __ldg(const double4* ptr)
 
 #endif
 
-=======
-__device__ float __ldg(const float* ptr)
-{
-    return ptr[0];
-}
->>>>>>> 75532471b2d124c4af823e838bf983a20debe6c4
+