solve merge error(about java packet name)

src/main/java/encoding/VlInt.java

@@ -1,6 +1,7 @@
-package encoding;
+package main.java.encoding;
 
-import util.ByteHelper;
+
+import main.java.util.ByteHelper;
 
 import java.math.BigInteger;
 
@@ -39,7 +40,7 @@ public class VlInt {
         return SizeOfVarNumber(this.VlIntValue);
     }
     private static int SizeOfVarNumber(BigInteger bigInteger){
-        if(bigInteger.compareTo(BigInteger.valueOf(Long.parseLong("241"))) < 0){
+        if(bigInteger.compareTo(BigInteger.valueOf(241)) < 0){
             return 1;
         }else if(bigInteger.compareTo(BigInteger.valueOf(
                 new Double(pow(2, 16)).longValue())) < 0){