1 files changed, 33 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181816GO.json b/StateTests/RandomTests/st201503181816GO.json
index 72c78ea90..e03a876d8 100644
--- a/StateTests/RandomTests/st201503181816GO.json
+++ b/StateTests/RandomTests/st201503181816GO.json
@@ -13,6 +13,7 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< HEAD
                 "balance" : "775164272",
                 "code" : "0x447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f9d32913678598b8d641a866970697a5560005155",
                 "nonce" : "0",
@@ -22,24 +23,47 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "47128",
+=======
+                "balance" : "722393059",
+                "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff586f4177f36331396d845a35618c0558775560005155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0x4177f36331396d845a35618c05587755"
+                }
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "49305",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< HEAD
                 "balance" : "999999999224788646",
+=======
+                "balance" : "999999999277557682",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
+<<<<<<< HEAD
         "postStateRoot" : "d2edec2e82cce5bc1ffc62c1ad19368a44a22e34273d059c3f1b0bb96430397e",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f9d32913678598b8d641a866970697a5560005155",
+=======
+        "postStateRoot" : "6c75fe07ed433f2b25bb19b0be5bee36dfd1c202fc232282e763406daba5355b",
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0",
+                "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff586f4177f36331396d845a35618c0558775560005155",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -60,13 +84,22 @@
             }
         },
         "transaction" : {
+<<<<<<< HEAD
             "data" : "0x447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f9d32913678598b8d641a866970697a",
             "gasLimit" : "0x752e9112",
+=======
+            "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff586f4177f36331396d845a35618c055877",
+            "gasLimit" : "0x06a56364",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< HEAD
             "value" : "775164272"
+=======
+            "value" : "722393059"
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
         }
     }
 }