diff --git a/src/decoder.hpp b/src/decoder.hpp
index 479cceea..ec5410f0 100644
--- a/src/decoder.hpp
+++ b/src/decoder.hpp
@@ -165,7 +165,6 @@ namespace zmq
             return false;
         }
 
->>>>>>> c543b2c... Resolve LIBZMQ-465
     protected:
 
         //  Prototype of state machine action. Action should return false if