ups... let me fix it.
 thanks for reporting @ferrybig !
 Fixed by https://github.com/netty/netty/pull/5725

git conflict markers in public javadoc
The following file contains git conflict markers: https://github.com/netty/netty/blob/4.0/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java#L107

These conflict markers are visible in the public javadoc for the hashcode and hexdump methods:

https://netty.io/4.0/api/io/netty/buffer/ByteBufUtil.html

buffer/src/main/java/io/netty/buffer/ByteBufUtil.java
buffer/src/main/java/io/netty/buffer/ByteBufUtil.java
diff --git a/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java b/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java
index f405d496cf1..1ff9efb5faa 100644
--- a/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java
+++ b/buffer/src/main/java/io/netty/buffer/ByteBufUtil.java
@@ -103,8 +103,6 @@ public static String hexDump(ByteBuf buffer, int fromIndex, int length) {
     }
 
     /**
-<<<<<<< HEAD
-=======
      * Returns a <a href="http://en.wikipedia.org/wiki/Hex_dump">hex dump</a>
      * of the specified byte array.
      */
@@ -121,7 +119,6 @@ public static String hexDump(byte[] array, int fromIndex, int length) {
     }
 
     /**
->>>>>>> e5386b0... Move Hex dump related util from ByteBufUtil to inner class
      * Calculates the hash code of the specified buffer.  This method is
      * useful when implementing a new buffer type.
      */
