diff -uNr a/bitcoin/src/bitcoinrpc.cpp b/bitcoin/src/bitcoinrpc.cpp
--- a/bitcoin/src/bitcoinrpc.cpp cfc24bce544ba71ed8e7e876a1074dc89da184c6aa7f0fc2ad8d0c213516b2b9539497d3176dd0a17ccb427d687ce8d3cc4d3b9969802c9da5f05a0617a2a30b
+++ b/bitcoin/src/bitcoinrpc.cpp 2e3020d722d1d9bc9a2725592918d26c10bdfd44b5e272f4c299af5433efc8ce18ea214418cf7c16c3cd1b6e416b870e29d82696d2ca403dcda6869ccda4fb32
@@ -21,6 +21,9 @@
 // a certain size around 145MB.  If we need access to json_spirit outside this
 // file, we could use the compiled json_spirit option.
 
+// Conflict test 1
+// Conflict test 1
+
 using namespace std;
 using namespace boost;
 using namespace boost::asio;