1 files changed, 34 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181642GO.json b/StateTests/RandomTests/st201503181642GO.json
index a9c7373d5..512234e52 100644
--- a/StateTests/RandomTests/st201503181642GO.json
+++ b/StateTests/RandomTests/st201503181642GO.json
@@ -13,6 +13,7 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< HEAD
                 "balance" : "828101873",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5457f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f588b7381783c089e981360ff397d435560005155",
                 "nonce" : "0",
@@ -22,24 +23,48 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "50137",
+=======
+                "balance" : "760606844",
+                "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff557ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6fa4689f439083796d6b687e92aa8c085560005155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0xa4689f439083796d6b687e92aa8c0855",
+                    "0xffffffffffffffffffffffffffffffffffffffff" : "0xffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "71432",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< HEAD
                 "balance" : "999999999171848036",
+=======
+                "balance" : "999999999239321770",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
+<<<<<<< HEAD
         "postStateRoot" : "7358188557b696a913a96bc749f6a4fe4444102475435c3fa1cce23a1aadaedd",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5457f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f588b7381783c089e981360ff397d435560005155",
+=======
+        "postStateRoot" : "c0f80f088845961214dd16dbcd5e8719d04e7379ce6f5ee84dd3575960710174",
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0",
+                "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff557ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6fa4689f439083796d6b687e92aa8c085560005155",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -60,13 +85,22 @@
             }
         },
         "transaction" : {
+<<<<<<< HEAD
             "data" : "0x7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b5457f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f588b7381783c089e981360ff397d43",
             "gasLimit" : "0x2a12da9f",
+=======
+            "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff407f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff557ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6fa4689f439083796d6b687e92aa8c08",
+            "gasLimit" : "0x47a286af",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< HEAD
             "value" : "828101873"
+=======
+            "value" : "760606844"
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
         }
     }
 }