diff --git a/src/surface.c b/src/surface.c
index e4f9259..7476126 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -146,17 +146,10 @@ float *generate_data_surface(unsigned char *s)
 	float *d_surface;
 	int *cara;
 
-<<<<<<< HEAD
 	parm.f = lens;
 	parm.m = 4;
 	parm.n = 4;
 	parm.grid = 5;
-=======
-	parm.f = klein;
-	parm.m = 2;
-	parm.n = 4;
-	parm.grid = 16;
->>>>>>> b19100424dbeaf4a4ecc88ddfc633b0c34fd0010
 
 #ifdef TEST
 	assert(numero_caras(2) == 1);
@@ -164,10 +157,6 @@ float *generate_data_surface(unsigned char *s)
 	assert(numero_caras(4) == 24);
 #endif
 
-<<<<<<< HEAD
-	cara = malloc(parm.m * sizeof(int));
-=======
->>>>>>> b19100424dbeaf4a4ecc88ddfc633b0c34fd0010
 	*s = parm.n;
 
 	cara = malloc(parm.m * sizeof(int));
@@ -199,23 +188,11 @@ float *generate_data_surface(unsigned char *s)
 						parm.f(&d_surface[q + 1], cara, parm.grid);
 						q += parm.n;
 
-<<<<<<< HEAD
-						cara[o] = i + 1;
-						cara[p] = j;
+						cara[p]++;
 						parm.f(&d_surface[q + 1], cara, parm.grid);
 						q += parm.n;
 
-						cara[o] = i + 1;
-						cara[p] = j + 1;
-=======
-						cara[p] = i + 1;
-						cara[o] = j;
-						parm.f(&d_surface[q + 1], cara, parm.grid);
-						q += parm.n;
-
-						cara[p] = i + 1;
-						cara[o] = j + 1;
->>>>>>> b19100424dbeaf4a4ecc88ddfc633b0c34fd0010
+						cara[o]++;
 						parm.f(&d_surface[q + 1], cara, parm.grid);
 						q += parm.n;
 
@@ -224,23 +201,11 @@ float *generate_data_surface(unsigned char *s)
 						parm.f(&d_surface[q + 1], cara, parm.grid);
 						q += parm.n;
 
-<<<<<<< HEAD
-						cara[o] = i;
-						cara[p] = j + 1;
+						cara[o]++;
 						parm.f(&d_surface[q + 1], cara, parm.grid);
 						q += parm.n;
 
-						cara[o] = i + 1;
-						cara [p] = j + 1;
-=======
-						cara[p] = i;
-						cara[o] = j + 1;
-						parm.f(&d_surface[q + 1], cara, parm.grid);
-						q += parm.n;
-
-						cara[p] = i + 1;
-						cara[o] = j + 1;
->>>>>>> b19100424dbeaf4a4ecc88ddfc633b0c34fd0010
+						cara[p]++;
 						parm.f(&d_surface[q + 1], cara, parm.grid);
 						q += parm.n;
 					}