1 files changed, 10 insertions, 43 deletions
diff --git a/StateTests/RandomTests/st201503181912GO.json b/StateTests/RandomTests/st201503181912GO.json
index 8d7b8fa8f..965779a01 100644
--- a/StateTests/RandomTests/st201503181912GO.json
+++ b/StateTests/RandomTests/st201503181912GO.json
@@ -13,57 +13,33 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-<<<<<<< HEAD
-                "balance" : "1757422723",
-                "code" : "0x417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f5b7433511a96677c60348289448d365260005155",
+                "balance" : "577304889",
+                "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56a3783316f1745661615f0f3029055",
                 "nonce" : "0",
                 "storage" : {
-                    "0x" : "0x5b7433511a96677c60348289448d3652"
+                    "0xc350" : "0x2029d92e633507ab6f9886c9b1a209d02eea1a14dc0bc257d78e20fa4c9ecf"
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "49558",
-=======
-                "balance" : "151291822",
-                "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f54728367420b97766ff374518e685b9d60005155",
-                "nonce" : "0",
-                "storage" : {
-                    "0x" : "0x54728367420b97766ff374518e685b9d"
-                }
-            },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "45207",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "balance" : "46992",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-<<<<<<< HEAD
-                "balance" : "999999998242527765",
-=======
-                "balance" : "999999999848663017",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "balance" : "999999999422648165",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-<<<<<<< HEAD
-        "postStateRoot" : "973ce25cf82fe658bc2dab884784cbc85bad4f759d24468d8a01ccaca1e9c0cb",
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0",
-                "code" : "0x417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f5b7433511a96677c60348289448d365260005155",
-=======
-        "postStateRoot" : "ee50e8279e3b795454b00b96493e161caf4c21d9b653ebba5dca6000f517c04e",
+        "postStateRoot" : "e14b93945a6906e10d39fc6ad182d2d377ab3079292213c4d0f2a010b7669290",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
-                "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f54728367420b97766ff374518e685b9d60005155",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56a3783316f1745661615f0f3029055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -84,22 +60,13 @@
             }
         },
         "transaction" : {
-<<<<<<< HEAD
-            "data" : "0x417f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f5b7433511a96677c60348289448d3652",
-            "gasLimit" : "0x2dde4783",
-=======
-            "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff6f54728367420b97766ff374518e685b9d",
-            "gasLimit" : "0x10ace30a",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+            "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe447f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56a3783316f1745661615f0f30290",
+            "gasLimit" : "0x2e4cad60",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-<<<<<<< HEAD
-            "value" : "1757422723"
-=======
-            "value" : "151291822"
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+            "value" : "577304889"
         }
     }
 }