1 files changed, 28 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181427GO.json b/StateTests/RandomTests/st201503181427GO.json
index f1e4eea3b..ce711e6d7 100644
--- a/StateTests/RandomTests/st201503181427GO.json
+++ b/StateTests/RandomTests/st201503181427GO.json
@@ -10,6 +10,7 @@
         },
         "logs" : [
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
             {
                 "address" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
                 "bloom" : "00000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000",
@@ -19,11 +20,14 @@
             }
 =======
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
         ],
         "out" : "0x",
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
                 "balance" : "713661428",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001645002187d550a5b59627a6a973aa07a5560005155",
                 "nonce" : "0",
@@ -33,6 +37,8 @@
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "187722450",
 =======
+=======
+>>>>>>> Stashed changes
                 "balance" : "245554995",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff147f0000000000000000000000010000000000000000000000000000000000000000207f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046d9f8174a23542680bf0835505527355",
                 "nonce" : "0",
@@ -42,6 +48,9 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "49201",
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
@@ -50,10 +59,14 @@
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
                 "balance" : "999999999098616168",
 =======
                 "balance" : "999999999754395850",
 >>>>>>> Stashed changes
+=======
+                "balance" : "999999999754395850",
+>>>>>>> Stashed changes
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -61,17 +74,23 @@
             }
         },
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
         "postStateRoot" : "f88a1ac891d601058b95ee3d86ca70cb5fbd2e084339d4b50d1fced8f6e7153b",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001645002187d550a5b59627a6a973aa07a5560005155",
 =======
+=======
+>>>>>>> Stashed changes
         "postStateRoot" : "06563de0a560de7a47b650b0c27bdbb9b00243ffa63c570633fea5881923a5d3",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff147f0000000000000000000000010000000000000000000000000000000000000000207f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046d9f8174a23542680bf0835505527355",
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
                 "nonce" : "0",
                 "storage" : {
@@ -94,21 +113,30 @@
         },
         "transaction" : {
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
             "data" : "0x7f0000000000000000000000000000000000000000000000000000000000000001427f00000000000000000000000000000000000000000000000000000000000000007f000000000000000000000000000000000000000000000000000000000000c350437f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f0000000000000000000000000000000000000000000000000000000000000001645002187d550a5b59627a6a973aa07a",
             "gasLimit" : "0x44965985",
 =======
             "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff147f0000000000000000000000010000000000000000000000000000000000000000207f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046d9f8174a23542680bf08355055273",
             "gasLimit" : "0x03f8e7f6",
 >>>>>>> Stashed changes
+=======
+            "data" : "0x7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff147f0000000000000000000000010000000000000000000000000000000000000000207f000000000000000000000000000000000000000000000000000000000000c3507ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe046d9f8174a23542680bf08355055273",
+            "gasLimit" : "0x03f8e7f6",
+>>>>>>> Stashed changes
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
             "value" : "713661428"
 =======
             "value" : "245554995"
 >>>>>>> Stashed changes
+=======
+            "value" : "245554995"
+>>>>>>> Stashed changes
         }
     }
 }