diff --git a/lib/x11/corereqs.js b/lib/x11/corereqs.js
index efa1bdc..5297da4 100644
--- a/lib/x11/corereqs.js
+++ b/lib/x11/corereqs.js
@@ -107,11 +107,6 @@ module.exports = {
    CreateWindow: [
        // create request packet - function OR format string
        function(id, parentId, x, y, width, height, borderWidth, _class, visual, values) {
-<<<<<<< HEAD
-           console.log('CreateWindow called', id);
-=======
->>>>>>> 3d3658d0b81642440a915e706d2c28b412c1a383
-
            // TODO: ??? there is depth field in xproto, but xlib just sets it to zero
            var depth = 0;