1 files changed, 38 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181540GO.json b/StateTests/RandomTests/st201503181540GO.json
index a3d87e3cf..4ec360261 100644
--- a/StateTests/RandomTests/st201503181540GO.json
+++ b/StateTests/RandomTests/st201503181540GO.json
@@ -9,6 +9,22 @@
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
+<<<<<<< HEAD
+        ],
+        "out" : "0x",
+        "post" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "1196147463",
+                "code" : "0x44417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000395560005155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "79229",
+=======
             {
                 "address" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
                 "bloom" : "00000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000",
@@ -28,24 +44,37 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "456118",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< HEAD
+                "balance" : "999999998803773354",
+=======
                 "balance" : "999999998237220232",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
+<<<<<<< HEAD
+        "postStateRoot" : "d0fef6f6ab48670bb8fa5e0a2402b4369e81b2e8b429676646ddefc1dd5818c0",
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0",
+                "code" : "0x44417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000395560005155",
+=======
         "postStateRoot" : "d71ce638907117f6bdacd55d5547feb04ea50a8c2da296dc887f5bbb909540b5",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350f36409156a6aa261413b56f20855",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -66,13 +95,22 @@
             }
         },
         "transaction" : {
+<<<<<<< HEAD
+            "data" : "0x44417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff457f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000039",
+            "gasLimit" : "0x78b005ff",
+=======
             "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f0000000000000000000000000000000000000000000000000000000000000001a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350f36409156a6aa261413b56f208",
             "gasLimit" : "0x39619002",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< HEAD
+            "value" : "1196147463"
+=======
             "value" : "1762323696"
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
         }
     }
 }