resolve conflict

Author: thongdk8

core/src/main/java/com/scalar/db/common/error/CoreError.java

@@ -1202,6 +1202,8 @@ public enum CoreError implements ScalarDbError {
       Category.INTERNAL_ERROR, "0052", "Failed to read JSON file. Details: %s.", "", ""),
   DATA_LOADER_JSONLINES_FILE_READ_FAILED(
       Category.INTERNAL_ERROR, "0053", "Failed to read JSON Lines file. Details: %s.", "", ""),
+  JDBC_TRANSACTION_GETTING_SCANNER_FAILED(
+      Category.INTERNAL_ERROR, "0054", "Getting the scanner failed. Details: %s", "", ""),
 
   //
   // Errors for the unknown transaction status error category