1 files changed, 25 insertions, 0 deletions
diff --git a/StateTests/RandomTests/st201503181423GO.json b/StateTests/RandomTests/st201503181423GO.json
index 110b492b9..ebc914b84 100644
--- a/StateTests/RandomTests/st201503181423GO.json
+++ b/StateTests/RandomTests/st201503181423GO.json
@@ -10,6 +10,7 @@
         },
         "logs" : [
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
             {
                 "address" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
                 "bloom" : "00000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000001000000000040000800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000008000000000000000000000000000000000000000000000000000000000040000000000040000000000000000040000000000040000000000000000000000020000000000000000000000000000000",
@@ -33,6 +34,8 @@
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "457370",
 =======
+=======
+>>>>>>> Stashed changes
         ],
         "out" : "0x",
         "post" : {
@@ -46,6 +49,9 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "51340",
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
                 "code" : "0x6000355415600957005b60203560003555",
                 "nonce" : "0",
@@ -54,10 +60,14 @@
             },
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
                 "balance" : "999999999368594097",
 =======
                 "balance" : "999999999557382927",
 >>>>>>> Stashed changes
+=======
+                "balance" : "999999999557382927",
+>>>>>>> Stashed changes
                 "code" : "0x",
                 "nonce" : "1",
                 "storage" : {
@@ -65,17 +75,23 @@
             }
         },
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
         "postStateRoot" : "5cbe2d4811cc7a3e1474e637cbafc3b2f7fa1a93f3cdb4fa977d58224e795fb5",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350a3f305205bf156207259573055",
 =======
+=======
+>>>>>>> Stashed changes
         "postStateRoot" : "1251ea927bb30f821a9dc4db5a791b94b9a47cc5327167616b128f161eb022e6",
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0",
                 "code" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f327f9c6e3b4241f09f01335017f26c5560005155",
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
                 "nonce" : "0",
                 "storage" : {
@@ -98,21 +114,30 @@
         },
         "transaction" : {
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
             "data" : "0x7f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c3507f00000000000000000000000000000000000000000000000000000000000000017f00000000000000000000000000000000000000000000000000000000000000017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000000000000000000000000000000000000000c3507f000000000000000000000000000000000000000000000000000000000000c350a3f305205bf1562072595730",
             "gasLimit" : "0x2e64c884",
 =======
             "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f327f9c6e3b4241f09f01335017f26c",
             "gasLimit" : "0x1f455129",
 >>>>>>> Stashed changes
+=======
+            "data" : "0x7f00000000000000000000000000000000000000000000000000000000000000017f000000000000000000000000ffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b57f000000000000000000000000945304eb96065b2a98b57a48a06ae28d285a71b56f327f9c6e3b4241f09f01335017f26c",
+            "gasLimit" : "0x1f455129",
+>>>>>>> Stashed changes
             "gasPrice" : "1",
             "nonce" : "0",
             "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
             "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
             "value" : "630948579"
 =======
             "value" : "442565779"
 >>>>>>> Stashed changes
+=======
+            "value" : "442565779"
+>>>>>>> Stashed changes
         }
     }
 }