# Conflicts: # project/dependencies/pom.xml # test/test-integration/src/main/java/test/com/jd/blockchain/intgr/IntegrationTest.java