1 files changed, 33 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181418GO.json b/StateTests/RandomTests/st201503181418GO.json
index 04635b959..1e44b9a27 100644
--- a/StateTests/RandomTests/st201503181418GO.json
+++ b/StateTests/RandomTests/st201503181418GO.json
@@ -13,6 +13,7 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< Updated upstream
                 "balance" : "1371008423",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000006fa2777c07bd95193720580bae178f0b5560005155",
                 "nonce" : "0",
@@ -22,24 +23,47 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "47706",
+=======
+                "balance" : "1441436953",
+                "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f0a714216688e937176f21942967d455560005155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0x0a714216688e937176f21942967d4555"
+                }
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "47594",
+>>>>>>> Stashed changes
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< Updated upstream
                 "balance" : "999999998628943917",
+=======
+                "balance" : "999999998558515499",
+>>>>>>> Stashed changes
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
+<<<<<<< Updated upstream
         "postStateRoot" : "39510e504bd3a26582af0a0c716d4551656c8254ffb1d44c052acc38be98f325",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000006fa2777c07bd95193720580bae178f0b5560005155",
+=======
+        "postStateRoot" : "d9226b7b6e4f6a005361cd6dee63a715284bde69b4cfcba980ec5d858ad42c07",
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0",
+                "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f0a714216688e937176f21942967d455560005155",
+>>>>>>> Stashed changes
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -60,13 +84,22 @@
             }
         },
         "transaction" : {
+<<<<<<< Updated upstream
             "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000000000000000000000000000000000000000000006fa2777c07bd95193720580bae178f0b",
             "gasLimit" : "0x5f174682",
+=======
+            "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000000447f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe017f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff406f0a714216688e937176f21942967d45",
+            "gasLimit" : "0x6156c653",
+>>>>>>> Stashed changes
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< Updated upstream
             "value" : "1371008423"
+=======
+            "value" : "1441436953"
+>>>>>>> Stashed changes
         }
     }
 }