diff --git a/lib/x11/ext/glxrender.js b/lib/x11/ext/glxrender.js
index ce927e3..bd83487 100644
--- a/lib/x11/ext/glxrender.js
+++ b/lib/x11/ext/glxrender.js
@@ -54,8 +54,6 @@ module.exports = function(GLX, ctx) {
         buffers.push(res);
     };
 
-<<<<<<< HEAD
-=======
     function serialize2i(opcode, value1, value2) {
        var res = commandBuffer(opcode, 12);
         res.writeUInt32LE(value1, 4);
@@ -63,7 +61,6 @@ module.exports = function(GLX, ctx) {
         buffers.push(res);
     }
 
->>>>>>> a5087c35c661b9177afa3c7a31502543a9dd2d51
     function serialize1i(opcode, value) {
        var res = commandBuffer(opcode, 8);
         res.writeUInt32LE(value, 4);