Fix merge conflict

.gitignore

@@ -17,5 +17,6 @@ fftma_module/gen/build/
 tools/connec/conec2d
 tools/connec/conec3d
 utilities/__pycache__/
-fftma_module/gen/log_*.txt
+fftma_module/gen/log_*
 fftma_module/gen/out*.npy
+.ipynb_checkpoints/analysis-checkpoint.ipynb

fftma_module/gen/lib_src/generate.c

@@ -16,8 +16,6 @@ void generate(long* seed, int n, struct realization_mod* realization, int cores)
     double* used_ram_t0 = malloc(sizeof(double));
     getVirtualMemUsed(used_ram_t0);
 
-    clock_t t = clock();
-
     log_info("RESULT = in progress, n = %d", n);
 
     struct cpustat initial[cores];
@@ -27,6 +25,8 @@ void generate(long* seed, int n, struct realization_mod* realization, int cores)
         get_stats(&initial[i], i - 1);
     }
 
+    clock_t t = clock();
+
     int i;
     long idum2 = 123456789, iy = 0;
     long* iv;