1 files changed, 10 insertions, 43 deletions
diff --git a/StateTests/RandomTests/st201503181523GO.json b/StateTests/RandomTests/st201503181523GO.json
index f1191a239..afe2ff1a1 100644
--- a/StateTests/RandomTests/st201503181523GO.json
+++ b/StateTests/RandomTests/st201503181523GO.json
@@ -13,57 +13,33 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-<<<<<<< HEAD
-                "balance" : "1904275173",
-                "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f8a4557504445a476900b3c6e126e9d5560005155",
+                "balance" : "1747410974",
+                "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f439f6a072043a57a7a6283988152731060005155",
                 "nonce" : "0",
                 "storage" : {
-                    "0x" : "0x8a4557504445a476900b3c6e126e9d55"
+                    "0x" : "0x439f6a072043a57a7a62839881527310"
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "49305",
-=======
-                "balance" : "1331541357",
-                "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f649d1702608e9a80680b87856172895560005155",
-                "nonce" : "0",
-                "storage" : {
-                    "0x" : "0x649d1702608e9a80680b878561728955"
-                }
-            },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "48666",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "balance" : "50256",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-<<<<<<< HEAD
-                "balance" : "999999998095675568",
-=======
-                "balance" : "999999998668410023",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "balance" : "999999998252538816",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-<<<<<<< HEAD
-        "postStateRoot" : "f290f3fd5afe3e3a4a3defd85b83d8a80f052766400ea575083d082f38d3ec55",
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0",
-                "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f8a4557504445a476900b3c6e126e9d5560005155",
-=======
-        "postStateRoot" : "ee01753515e2302373b66c5bff9dd5258350c3c1606f65508a454fe4a1d00417",
+        "postStateRoot" : "f64eacdb66c44e3bfa5e1e4a390efb7b6b6ef0a38c2be5dd7ed3c5cace24114a",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
-                "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f649d1702608e9a80680b87856172895560005155",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f439f6a072043a57a7a6283988152731060005155",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -84,22 +60,13 @@
             }
         },
         "transaction" : {
-<<<<<<< HEAD
-            "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f0000000000000000000000000000000000000000000000000000000000000001457f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe6f8a4557504445a476900b3c6e126e9d",
-            "gasLimit" : "0x4f58d43c",
-=======
-            "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000006f649d1702608e9a80680b8785617289",
-            "gasLimit" : "0x67e83f85",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+            "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f439f6a072043a57a7a62839881527310",
+            "gasLimit" : "0x740983bc",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-<<<<<<< HEAD
-            "value" : "1904275173"
-=======
-            "value" : "1331541357"
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+            "value" : "1747410974"
         }
     }
 }