diff --git a/TP1/tris.c b/TP1/tris.c
index f4037e4c10e06ab2a0bbd9a8fb9ba78174e4ae17..d3df80cbcad7dabaddc3cb3300a1f62e1b07dd95 100644
--- a/TP1/tris.c
+++ b/TP1/tris.c
@@ -73,42 +73,6 @@ void fusion(long* A, size_t first, size_t middle, size_t size) {
     free(ad);
 }
 
-<<<<<<< HEAD
-void triRapide(long* A, size_t n){
-    soustriRapide(A,0,n-1);
-} 
-
-void soustriRapide( long* A, size_t p, size_t r){
-    if(p<r-1){
-        size_t q = partition(A,p,r);
-        soustriRapide(A,p,q-1);
-        soustriRapide(A,q+1,r);
-    } 
-}
-
-size_t partition(long* A, size_t p, size_t r){
-    long pivot = A[r-1];
-    size_t i = p;
-    for(int j = p; j <= r-2; j++){
-        if(A[j] <= pivot){
-            permuter(A,i,j);
-            i++;
-        } 
-    }
-    permuter(A,i,r-1);
-    return i;  
-}
-
-void permuter(long* A,size_t i,size_t j){
-    long inter = A[i];
-    A[i] = A[j];
-    A[j] = inter;   
-} 
-
-// voila le début de tri rapide si j'ai pas le temp de le finir 
-// ni de le testé 
- 
-=======
 void triRapide(long* A, size_t n) {
     sousTriRapide(A,0,n);
 }
@@ -139,4 +103,3 @@ void permuter(long* A,size_t i,size_t j) {
     A[i] = A[j];
     A[j] = inter;
 }
->>>>>>> f61484c65f74d3b49ca5a7a457807526ac75448b
diff --git a/TP1/tris.h b/TP1/tris.h
index 9c8ed8f448e0eca0f6529fcb430242d84d7a4c4d..9841ffb6e67d3ae291493953eb6087b81d284159 100644
--- a/TP1/tris.h
+++ b/TP1/tris.h
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #ifndef TRIS_H
 #define TRIS_H
 #include <stdint.h>
@@ -10,25 +9,9 @@ void triFusion(long* A, size_t size);
 void sousTriFusion(long* A, size_t first, size_t size);
 void fusion(long* A, size_t first, size_t middle, size_t size);
 
-void soustriRapide( long* A, size_t p, size_t r);
+void triRapide(long* A, size_t n);
+void sousTriRapide(long* A, size_t first, size_t size);
+size_t partition(long* A, size_t first, size_t size);
+void permuter(long* A,size_t i,size_t j);
 
 #endif //TRIS_H
-=======
-#ifndef TRIS_H
-#define TRIS_H
-#include <stdint.h>
-#include <stdlib.h>
-
-void triInsertion(long* A, size_t n);
-
-void triFusion(long* A, size_t size);
-void sousTriFusion(long* A, size_t first, size_t size);
-void fusion(long* A, size_t first, size_t middle, size_t size);
-
-void triRapide(long* A, size_t n);
-void sousTriRapide(long* A, size_t first, size_t size);
-size_t partition(long* A, size_t first, size_t size);
-void permuter(long* A,size_t i,size_t j);
-
-#endif //TRIS_H
->>>>>>> f61484c65f74d3b49ca5a7a457807526ac75448b