Fixed merge issues.

src/main/java/org/qortal/api/ApiError.java

@@ -132,7 +132,7 @@ public enum ApiError {
 	FOREIGN_BLOCKCHAIN_TOO_SOON(1203, 408),
 
 	// Trade portal
-	ORDER_SIZE_TOO_SMALL(1300, 402);
+	ORDER_SIZE_TOO_SMALL(1300, 402),
 
 	// Data
 	FILE_NOT_FOUND(1401, 404),

src/main/java/org/qortal/repository/hsqldb/HSQLDBDatabaseUpdates.java

@@ -4,6 +4,8 @@ import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Arrays;
+import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;