diff --git a/src/buffers/ElementBuffer.cpp b/src/buffers/ElementBuffer.cpp
index 7b87eb6..654185f 100644
--- a/src/buffers/ElementBuffer.cpp
+++ b/src/buffers/ElementBuffer.cpp
@@ -3,11 +3,7 @@
 namespace lol
 {
 	ElementBuffer::ElementBuffer(const std::vector<unsigned int>& elements, Usage usage) :
-<<<<<<< HEAD
 		Buffer(BufferType::ElementArray), count(elements.size())
-=======
-		Buffer(BufferType::ElementArray), count(count)
->>>>>>> 7b071b2db64f25ad5bfd602c42dd8f17b75e3948
 	{
 		glBufferData(NATIVE(type), elements.size() * sizeof(unsigned int), elements.data(), NATIVE(usage));
 	}