diff --git a/calculette.py b/calculette.py
index dc935a3..8710ed3 100644
--- a/calculette.py
+++ b/calculette.py
@@ -41,7 +41,10 @@ class Expression:
             return "("+ str (self.gauche) + "-" + str (self.droite) + ")"
     
     def __repr__(self):
+<<<<<<< HEAD
         """Méthode permettant d'afficher l'expression"""
+=======
+>>>>>>> 0fcf23e11827bd5ed1bb0b8128905b142750c2f0
         return str(self)
         
         
@@ -60,6 +63,7 @@ def npi2tree(lst):
             exp.append(int(ele))
     return exp.pop()
 
+<<<<<<< HEAD
 class Calculette:
     """Classe représentant une calculette"""
     def __init__(self):
@@ -72,5 +76,7 @@ class Calculette:
         except Exception as e:
             return str(e)
 
+=======
+>>>>>>> 0fcf23e11827bd5ed1bb0b8128905b142750c2f0
 if __name__ == "__main__":
     npi2tree(["3","4","+","6","*"])
diff --git a/intergraph.py b/intergraph.py
index 7e6ca15..d64a713 100644
--- a/intergraph.py
+++ b/intergraph.py
@@ -1,4 +1,5 @@
 from tkinter import *
+<<<<<<< HEAD
 from modules.calculette import Calculette
 
 
@@ -24,10 +25,20 @@ fenetre.title("Calculatrice")
 calculatrice = Calculette()
 
 calcLabel = Label(fenetre, text="Saisir le calcul")
+=======
+from calculette import *
+
+
+fenetre=Tk()
+fenetre.title("Calculatrice")
+
+calcLabel = Label(fenetre, text="saisir le calcul")
+>>>>>>> 0fcf23e11827bd5ed1bb0b8128905b142750c2f0
 calcLabel.pack()
 
 calc = StringVar()
 calc.set("")
+<<<<<<< HEAD
 saisie = Entry(fenetre, textvariable=calc, width=40)
 saisie.pack()
 
@@ -52,4 +63,14 @@ Button(fenetre, text="EFFACER", width=40, command=effacer).pack()
 result_label = Label(fenetre, text="")
 result_label.pack()
 
-fenetre.mainloop()
\ No newline at end of file
+fenetre.mainloop()
+=======
+saisie = Entry(fenetre, textvariable=calc, width=10)
+saisie.pack()
+
+bouton1 = Button(fenetre, text="CALCULER", width=8)
+bouton1.pack()
+
+fenetre.mainloop()
+
+>>>>>>> 0fcf23e11827bd5ed1bb0b8128905b142750c2f0