diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl
index d2580918..79bbb422 100644
--- a/glm/detail/type_vec4.inl
+++ b/glm/detail/type_vec4.inl
@@ -68,7 +68,6 @@ namespace detail
 			return tvec4<T, P>(a.x / b.x, a.y / b.y, a.z / b.z, a.w / b.w);
 		}
 	};
-<<<<<<< HEAD
 
 	template <typename T, precision P>
 	struct compute_vec4_mod
@@ -123,8 +122,6 @@ namespace detail
 			return tvec4<T, P>(a.x >> b.x, a.y >> b.y, a.z >> b.z, a.w >> b.w);
 		}
 	};
-=======
->>>>>>> simd
 }//namespace detail
 
 	// -- Implicit basic constructors --