[14:57:48.977] Dependencies file "src/CMakeFiles/bitcoin_node.dir/node/timeoffsets.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.977] Dependencies file "src/CMakeFiles/bitcoin_node.dir/node/transaction.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.979] Dependencies file "src/CMakeFiles/bitcoin_node.dir/node/txdownloadman_impl.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.981] Dependencies file "src/CMakeFiles/bitcoin_node.dir/node/txorphanage.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.982] Dependencies file "src/CMakeFiles/bitcoin_node.dir/node/txreconciliation.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.983] Dependencies file "src/CMakeFiles/bitcoin_node.dir/node/utxo_snapshot.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.984] Dependencies file "src/CMakeFiles/bitcoin_node.dir/node/warnings.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.985] Dependencies file "src/CMakeFiles/bitcoin_node.dir/noui.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.986] Dependencies file "src/CMakeFiles/bitcoin_node.dir/policy/ephemeral_policy.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.988] Dependencies file "src/CMakeFiles/bitcoin_node.dir/policy/fees.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.988] Dependencies file "src/CMakeFiles/bitcoin_node.dir/policy/fees_args.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.989] Dependencies file "src/CMakeFiles/bitcoin_node.dir/policy/packages.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.989] Dependencies file "src/CMakeFiles/bitcoin_node.dir/policy/rbf.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.990] Dependencies file "src/CMakeFiles/bitcoin_node.dir/policy/settings.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.991] Dependencies file "src/CMakeFiles/bitcoin_node.dir/policy/truc_policy.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.992] Dependencies file "src/CMakeFiles/bitcoin_node.dir/rest.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.994] Dependencies file "src/CMakeFiles/bitcoin_node.dir/rpc/blockchain.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.995] Dependencies file "src/CMakeFiles/bitcoin_node.dir/rpc/external_signer.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.996] Dependencies file "src/CMakeFiles/bitcoin_node.dir/rpc/fees.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.997] Dependencies file "src/CMakeFiles/bitcoin_node.dir/rpc/mempool.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:48.999] Dependencies file "src/CMakeFiles/bitcoin_node.dir/rpc/mining.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:49.000] Dependencies file "src/CMakeFiles/bitcoin_node.dir/rpc/net.cpp.o.d" is newer than depends file "/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src/CMakeFiles/bitcoin_node.dir/compiler_depend.internal".
[14:57:49.140] Consolidate compiler generated dependencies of target bitcoin_node
[14:57:49.142] gmake[2]: Leaving directory '/ci_container_base/ci/scratch/build-arm-linux-gnueabihf'
[14:57:49.143] /bin/gmake  -f src/CMakeFiles/bitcoin_node.dir/build.make src/CMakeFiles/bitcoin_node.dir/build
[14:57:49.206] gmake[2]: Entering directory '/ci_container_base/ci/scratch/build-arm-linux-gnueabihf'
[14:57:49.220] [ 20%] Building CXX object src/CMakeFiles/bitcoin_node.dir/node/txreconciliation.cpp.o
[14:57:49.222] cd /ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src && /bin/ccache /bin/arm-linux-gnueabihf-g++ -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DENABLE_ZMQ=1 -D_FILE_OFFSET_BITS=64 -I/ci_container_base/ci/scratch/build-arm-linux-gnueabihf/src -I/ci_container_base/src -I/ci_container_base/src/leveldb/include -I/ci_container_base/src/minisketch/include -I/ci_container_base/src/univalue/include -isystem /ci_container_base/depends/arm-linux-gnueabihf/include -Wno-psabi -Wno-error=maybe-uninitialized -O2 -O2 -g -std=c++20 -fPIC -fvisibility=hidden -fno-extended-identifiers -fdebug-prefix-map=/ci_container_base/src=. -fmacro-prefix-map=/ci_container_base/src=. -fstack-reuse=none -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -Wstack-protector -fstack-protector-all -fstack-clash-protection -Werror -Wall -Wextra -Wformat -Wformat-security -Wvla -Wredundant-decls -Wdate-time -Wduplicated-branches -Wduplicated-cond -Wlogical-op -Woverloaded-virtual -Wsuggest-override -Wimplicit-fallthrough -Wunreachable-code -Wbidi-chars=any -Wundef -Wno-unused-parameter -MD -MT src/CMakeFiles/bitcoin_node.dir/node/txreconciliation.cpp.o -MF CMakeFiles/bitcoin_node.dir/node/txreconciliation.cpp.o.d -o CMakeFiles/bitcoin_node.dir/node/txreconciliation.cpp.o -c /ci_container_base/src/node/txreconciliation.cpp  
[14:57:54.244] /ci_container_base/src/node/txreconciliation.cpp: In member function ‘AddToSetResult TxReconciliationTracker::Impl::AddToSet(NodeId, const Wtxid&)’:
[14:57:54.244] /ci_container_base/src/node/txreconciliation.cpp:233:1: error: version control conflict marker in file
[14:57:54.244]   233 | <<<<<<< HEAD
[14:57:54.244]       | ^~~~~~~
[14:57:54.244] /ci_container_base/src/node/txreconciliation.cpp:236:1: error: version control conflict marker in file
[14:57:54.244]   236 | =======
[14:57:54.244]       | ^~~~~~~
[14:57:54.244] /ci_container_base/src/node/txreconciliation.cpp:241:1: error: version control conflict marker in file
[14:57:54.244]   241 | >>>>>>> 413cc6e26a (p2p: Deal with shortid collisions for reconciliation sets)
[14:57:54.244]       | ^~~~~~~
[14:57:54.244] /ci_container_base/src/node/txreconciliation.cpp: In member function ‘bool TxReconciliationTracker::Impl::TryRemovingFromSet(NodeId, const Wtxid&)’:
[14:57:54.244] /ci_container_base/src/node/txreconciliation.cpp:265:1: error: version control conflict marker in file
[14:57:54.244]   265 | <<<<<<< HEAD
[14:57:54.244]       | ^~~~~~~
[14:57:54.244] /ci_container_base/src/node/txreconciliation.cpp:268:1: error: version control conflict marker in file
[14:57:54.244]   268 | =======
[14:57:54.244]       | ^~~~~~~
[14:57:54.244] /ci_container_base/src/node/txreconciliation.cpp:273:1: error: version control conflict marker in file
[14:57:54.244]   273 | >>>>>>> 413cc6e26a (p2p: Deal with shortid collisions for reconciliation sets)
[14:57:54.244]       | ^~~~~~~
[14:57:54.248] gmake[2]: *** [src/CMakeFiles/bitcoin_node.dir/build.make:874: src/CMakeFiles/bitcoin_node.dir/node/txreconciliation.cpp.o] Error 1
[14:57:54.248] gmake[2]: Leaving directory '/ci_container_base/ci/scratch/build-arm-linux-gnueabihf'
[14:57:54.249] gmake[1]: *** [CMakeFiles/Makefile2:792: src/CMakeFiles/bitcoin_node.dir/all] Error 2
[14:57:54.249] gmake[1]: Leaving directory '/ci_container_base/ci/scratch/build-arm-linux-gnueabihf'
[14:57:54.250] gmake: *** [Makefile:146: all] Error 2
[14:57:54.254] 
[14:57:54.283] 
[14:57:54.283] Exit status: 2������������������������������������