resolve merge conflicts

Author: Artem

redisinsight/api/src/modules/database-import/database-import.service.ts

@@ -117,11 +117,9 @@ export class DatabaseImportService {
     try {
       const data: any = {};
 
-    // set this is a new connection
-    data.new = true
+      // set this is a new connection
+      data.new = true;
 
-    this.fieldsMapSchema.forEach(([field, paths]) => {
-      let value;
       this.fieldsMapSchema.forEach(([field, paths]) => {
         let value;
 
@@ -130,8 +128,8 @@ export class DatabaseImportService {
           return value === undefined;
         });
 
-      set(data, field, value);
-    });
+        set(data, field, value);
+      });
 
       // set database name if needed
       if (!data.name) {