1 files changed, 33 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181856GO.json b/StateTests/RandomTests/st201503181856GO.json
index 89311ccd5..ca1837aaa 100644
--- a/StateTests/RandomTests/st201503181856GO.json
+++ b/StateTests/RandomTests/st201503181856GO.json
@@ -13,6 +13,7 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< HEAD
                 "balance" : "1321324682",
                 "code" : "0x417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f808e813c728a430a16566162105b5a5560005155",
                 "nonce" : "0",
@@ -22,24 +23,47 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "51474",
+=======
+                "balance" : "1127907807",
+                "code" : "0x417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f959b99377bf869899e054471456b825560005155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0x959b99377bf869899e054471456b8255"
+                }
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "45074",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< HEAD
                 "balance" : "999999998678623890",
+=======
+                "balance" : "999999998872047165",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
+<<<<<<< HEAD
         "postStateRoot" : "8b70047a581f47ebe8dc30ab18edb435b88693d484ee34b7afa2376c8774a2c6",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f808e813c728a430a16566162105b5a5560005155",
+=======
+        "postStateRoot" : "bc3fa9c2a44e04d9be4c630bd151e2df67bd8d34da0bff8e4104437cee528029",
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0",
+                "code" : "0x417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f959b99377bf869899e054471456b825560005155",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -60,13 +84,22 @@
             }
         },
         "transaction" : {
+<<<<<<< HEAD
             "data" : "0x417ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f808e813c728a430a16566162105b5a",
             "gasLimit" : "0x0b04af9d",
+=======
+            "data" : "0x417f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000016f959b99377bf869899e054471456b82",
+            "gasLimit" : "0x7c2e193a",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< HEAD
             "value" : "1321324682"
+=======
+            "value" : "1127907807"
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
         }
     }
 }