1 files changed, 10 insertions, 43 deletions
diff --git a/StateTests/RandomTests/st201503181637CPPJIT.json b/StateTests/RandomTests/st201503181637CPPJIT.json
index 0769e1045..ac127fb0a 100644
--- a/StateTests/RandomTests/st201503181637CPPJIT.json
+++ b/StateTests/RandomTests/st201503181637CPPJIT.json
@@ -13,57 +13,33 @@
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-<<<<<<< HEAD
-                "balance" : "713778417",
-                "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0955",
+                "balance" : "2136192493",
+                "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff930955",
                 "nonce" : "0",
                 "storage" : {
-                    "0x01" : "0x01"
+                    "0xfffffffffffffffffffffffeffffffffffffffffffffffffffffffffffffffff" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "48793",
-=======
-                "balance" : "1056753988",
-                "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8609045560005155",
-                "nonce" : "0",
-                "storage" : {
-                    "0x014f8b588e368f08461f9f" : "0x01"
-                }
-            },
-            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "51515",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "balance" : "53665",
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-<<<<<<< HEAD
-                "balance" : "999999999286172836",
-=======
-                "balance" : "999999998943194543",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "balance" : "999999997863753888",
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
-<<<<<<< HEAD
-        "postStateRoot" : "629d9d581d42496f855020e0ae59dbce2d64087877853aecf8d92a3935f9525b",
-        "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0",
-                "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0955",
-=======
-        "postStateRoot" : "4c784a74fb5ed52c6da3064c61653cc3b3b6581d1bb7f8854a4270eaa4ca3168",
+        "postStateRoot" : "690fb70a2c190d3d4926226e64eee96f5f5d5c0cbc5939b2fd635d08cafc3ee1",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
-                "code" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe8609045560005155",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+                "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff930955",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -84,22 +60,13 @@
             }
         },
         "transaction" : {
-<<<<<<< HEAD
-            "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000007f0000000000000000000000000000000000000000000000000000000000000000427f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe09",
-            "gasLimit" : "0x696f2036",
-=======
-            "data" : "0x7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe860904",
-            "gasLimit" : "0x754e4035",
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+            "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f00000000000000000000000100000000000000000000000000000000000000007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9309",
+            "gasLimit" : "0x22feffd5",
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-<<<<<<< HEAD
-            "value" : "713778417"
-=======
-            "value" : "1056753988"
->>>>>>> bc09d2e0904fc9fef88ed9921b588593df4cf839
+            "value" : "2136192493"
         }
     }
 }