1 files changed, 33 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181708GO.json b/StateTests/RandomTests/st201503181708GO.json
index f7c6ce358..8fd2cc2d4 100644
--- a/StateTests/RandomTests/st201503181708GO.json
+++ b/StateTests/RandomTests/st201503181708GO.json
@@ -13,6 +13,7 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< HEAD
                 "balance" : "1022262859",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f0000000000000000000000000000000000000000000000000000000000000001047fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f38578a8d6e83a173ff159316458d8f5560005155",
                 "nonce" : "0",
@@ -22,24 +23,47 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "48347",
+=======
+                "balance" : "1734864141",
+                "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0460005155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0x014f8b588e368f08461f9f01b866e43aa79bbadc0980b242070b8cfbfc6540"
+                }
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "50464",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< HEAD
                 "balance" : "999999998977688840",
+=======
+                "balance" : "999999998265085441",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
+<<<<<<< HEAD
         "postStateRoot" : "6d8734063a6e81d893045b530e631ee756ef309e12d8b7b9f066627ec1b46f3e",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f0000000000000000000000000000000000000000000000000000000000000001047fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f38578a8d6e83a173ff159316458d8f5560005155",
+=======
+        "postStateRoot" : "61c21163d3d0aa293dc070c5c08ea8034d2424587796e86350781d9b818d42e8",
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0",
+                "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0460005155",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -60,13 +84,22 @@
             }
         },
         "transaction" : {
+<<<<<<< HEAD
             "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c350447f0000000000000000000000000000000000000000000000000000000000000001047fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6f38578a8d6e83a173ff159316458d8f",
             "gasLimit" : "0x72f4c21c",
+=======
+            "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04",
+            "gasLimit" : "0x5917c8ed",
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< HEAD
             "value" : "1022262859"
+=======
+            "value" : "1734864141"
+>>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
         }
     }
 }