diff --git a/main.py b/main.py
index 9ebd6f43f4b64fc6b8768a884032bcba381ca93f..196cab5a2d6bf60f2759f46688b31b6b6513a0c8 100644
--- a/main.py
+++ b/main.py
@@ -60,15 +60,9 @@ def classement_arbres(liste_coord):
 
 if __name__=="__main__":
     
-<<<<<<< HEAD
     t1 = time.time()
     lat, lon = 48.898867, 2.237485
     print(tree_position(lat, lon))
-=======
-    '''t1 = time.time()
-    lat, lon = 48.892046, 2.249319
-    #print(tree_position(lat, lon))
->>>>>>> 6899c2939dfc49fc78620b32ffd1efe547f87229
     t2 = time.time()
     #print(t2-t1)
     
diff --git a/research.py b/research.py
index ab83ab6fb48dd3eb19f738f597af01b000b505e2..4fa73a03f2e64a5d76a7f797a5b6f1f5de58f36c 100644
--- a/research.py
+++ b/research.py
@@ -20,6 +20,18 @@ def circular_research(lat, lon, main_street):
         step += 4*10**(-5)
     return None
 
+def circular_research_2(lat, lon, main_street=''):
+    #Recherche un rue autre que main_street par recherche circulaire autour du point d'intersection
+    step = 2*10**(-5)
+    found = False
+    while not(found):
+        for i in range(8):
+            street = check_position(lat, lon, step, main_street, i)
+            if not(street == main_street):
+                return street
+        step += 2*10**(-5)
+    return street
+
 def check_position(lat, lon, step, main_street, i):
     #Calcul les positions autour du point centrale et récupère la rue associée à cette position
     street = ''