diff --git a/src/main/java/com/luminiasoft/bitshares/Memo.java b/src/main/java/com/luminiasoft/bitshares/Memo.java
index 1f95c22..b74ef52 100644
--- a/src/main/java/com/luminiasoft/bitshares/Memo.java
+++ b/src/main/java/com/luminiasoft/bitshares/Memo.java
@@ -21,7 +21,7 @@ public class Memo implements ByteSerializable {
     public byte[] toBytes() {
         if ((this.from == null) || (this.to == null) || (this.nonce == null) ||(this.message == null)){
             return new byte[] { (byte) 0 };
-        } 
+        }
         
         byte[] result = new byte[this.from.length+this.to.length+this.nonce.length+this.message.length];
         System.arraycopy(this.from, 0, result, 0, this.from.length);
diff --git a/src/main/java/com/luminiasoft/bitshares/Util.java b/src/main/java/com/luminiasoft/bitshares/Util.java
index d6b45f7..2eb7a69 100644
--- a/src/main/java/com/luminiasoft/bitshares/Util.java
+++ b/src/main/java/com/luminiasoft/bitshares/Util.java
@@ -11,7 +11,10 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+<<<<<<< HEAD
 import java.nio.ByteBuffer;
+=======
+>>>>>>> 9d4ca57823604965fa940c07c0752249d701cd59
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Arrays;