1 files changed, 10 insertions, 43 deletions
diff --git a/StateTests/RandomTests/st201503181720GO.json b/StateTests/RandomTests/st201503181720GO.json
index 0f59b3892..2f902094e 100644
--- a/StateTests/RandomTests/st201503181720GO.json
+++ b/StateTests/RandomTests/st201503181720GO.json
@@ -13,57 +13,33 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-<<<<<<< HEAD
-                "balance" : "175635233",
-                "code" : "0x7f0000000000000000000000010000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001375560005155",
+                "balance" : "491773658",
+                "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000437f0000000000000000000000000000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000016f9376a3826934018541a05a8f9517705560005155",
                 "nonce" : "0",
                 "storage" : {
-                    "0x0100000000000000000000000000000000000000" : "0xc350"
+                    "0x" : "0x9376a3826934018541a05a8f95177055"
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "62247",
-=======
-                "balance" : "122271441",
-                "code" : "0x447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000000047f000000000000000000000000000000000000000000000000000000000000c3506f63563bc8864166584f186e79a455905560005155",
-                "nonce" : "0",
-                "storage" : {
-                    "0x" : "0x63563bc8864166584f186e79a4559055"
-                }
-            },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "47642",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "balance" : "49688",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-<<<<<<< HEAD
-                "balance" : "999999999824302566",
-=======
-                "balance" : "999999999877680963",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "balance" : "999999999508176700",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-<<<<<<< HEAD
-        "postStateRoot" : "48458e73ad3451dc3db3d88f6d84a0ddaae2468dc0863abefb9482c6299268f3",
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0",
-                "code" : "0x7f0000000000000000000000010000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f0000000000000000000000000000000000000000000000000000000000000001375560005155",
-=======
-        "postStateRoot" : "a6b42a81a1119ca19a06bcc59f665545ae7adb2340aec4c4c9b48aa6288756f3",
+        "postStateRoot" : "fbc2fa9f2a78fc7fbc3409b4aea1f08eee1bd7a2fbf23db712ee6ea0d96a8cfb",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
-                "code" : "0x447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000000047f000000000000000000000000000000000000000000000000000000000000c3506f63563bc8864166584f186e79a455905560005155",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000437f0000000000000000000000000000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000016f9376a3826934018541a05a8f9517705560005155",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -84,22 +60,13 @@
             }
         },
         "transaction" : {
-<<<<<<< HEAD
-            "data" : "0x7f0000000000000000000000010000000000000000000000000000000000000000427f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000000137",
-            "gasLimit" : "0x133ef319",
-=======
-            "data" : "0x447fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f0000000000000000000000000000000000000000000000000000000000000000047f000000000000000000000000000000000000000000000000000000000000c3506f63563bc8864166584f186e79a45590",
-            "gasLimit" : "0x5ed19a12",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+            "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f0000000000000000000000000000000000000000000000000000000000000000437f0000000000000000000000000000000000000000000000000000000000000000417f00000000000000000000000000000000000000000000000000000000000000016f9376a3826934018541a05a8f951770",
+            "gasLimit" : "0x5560945e",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-<<<<<<< HEAD
-            "value" : "175635233"
-=======
-            "value" : "122271441"
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+            "value" : "491773658"
         }
     }
 }