1 files changed, 37 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181408CPPJIT.json b/StateTests/RandomTests/st201503181408CPPJIT.json
index 321dba6cf..ec2fa1876 100644
--- a/StateTests/RandomTests/st201503181408CPPJIT.json
+++ b/StateTests/RandomTests/st201503181408CPPJIT.json
@@ -9,6 +9,7 @@
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
         "logs" : [
+<<<<<<< Updated upstream
             {
                 "address" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
                 "bloom" : "00000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000010000000000000000000000000000000000000000000000000000000000000000000000000001000002000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000040080000000000000000000000000000000000000000000000000000",
@@ -18,10 +19,13 @@
                     "000000000000000000000000ffffffffffffffffffffffffffffffffffffffff"
                 ]
             }
+=======
+>>>>>>> Stashed changes
         ],
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+<<<<<<< Updated upstream
                 "balance" : "1731252879",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000005a20960005155",
                 "nonce" : "0",
@@ -31,24 +35,48 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "48789",
+=======
+                "balance" : "1045066974",
+                "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155",
+                "nonce" : "0",
+                "storage" : {
+                    "0x" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5",
+                    "0xffffffffffffffffffffffff000000000000000000000000ffffffffffffffff" : "0xffffffffffffffffffffffffffffffffffffffff"
+                }
+            },
+            "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                "balance" : "70147",
+>>>>>>> Stashed changes
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+<<<<<<< Updated upstream
                 "balance" : "999999998268698378",
+=======
+                "balance" : "999999998954862925",
+>>>>>>> Stashed changes
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
                 }
             }
         },
+<<<<<<< Updated upstream
         "postStateRoot" : "0f5a9cb02e1188b463b6fe0aa3ced9af6618de967a11be6dc4cd1cd9d5d5f663",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000005a20960005155",
+=======
+        "postStateRoot" : "2908724b3e5164d4b9021b0ad2501b98861ef8af83748c5ea3af5f712edad1c3",
+        "pre" : {
+            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0",
+                "code" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff095560005155",
+>>>>>>> Stashed changes
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -69,13 +97,22 @@
             }
         },
         "transaction" : {
+<<<<<<< Updated upstream
             "data" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f00000000000000000000000000000000000000000000000000000000000000007f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000000005a209",
             "gasLimit" : "0x32748414",
+=======
+            "data" : "0x7f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f00000000000000000000000100000000000000000000000000000000000000007f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff09",
+            "gasLimit" : "0x535c5400",
+>>>>>>> Stashed changes
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+<<<<<<< Updated upstream
             "value" : "1731252879"
+=======
+            "value" : "1045066974"
+>>>>>>> Stashed changes
         }
     }
 }