fix conflict

Author: Yrp

src/main/java/org/tron/core/db/Manager.java

@@ -417,7 +417,7 @@ private void switchFork(BlockCapsule newHead) {
 
     if (CollectionUtils.isNotEmpty(binaryTree.getValue())) {
       while (!getDynamicPropertiesStore().getLatestBlockHeaderHash().equals(
-          binaryTree.getValue().peekLast().getParentHash().getBytes())) {
+          binaryTree.getValue().peekLast().getParentHash())) {
         try {
           eraseBlock();
         } catch (BadItemException e) {

src/test/java/org/tron/core/db/ManagerTest.java

@@ -233,9 +233,9 @@ public void fork() throws ValidateSignatureException,
     Assert.assertEquals(dbManager.getBlockIdByNum(dbManager.getHead().getNum() - 2),
         blockCapsule1.getParentHash());
 
-    Assert.assertEquals(blockCapsule2.getBlockId().getByteString(),
+    Assert.assertEquals(blockCapsule2.getBlockId(),
         dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash());
-    Assert.assertEquals(dbManager.getHead().getBlockId().getByteString(),
+    Assert.assertEquals(dbManager.getHead().getBlockId(),
         dbManager.getDynamicPropertiesStore().getLatestBlockHeaderHash());
   }