diff --git a/la_chariotte/order/models.py b/la_chariotte/order/models.py
index 4b5f4e7..4c4881f 100644
--- a/la_chariotte/order/models.py
+++ b/la_chariotte/order/models.py
@@ -1,5 +1,3 @@
-import datetime
-
 from django.db import models
 from django.utils import timezone
 
@@ -14,15 +12,11 @@ class GroupedOrder(models.Model):
         """Returns True if the grouped order is open for new Orders - False if it's too late"""
         return self.deadline >= timezone.now()
 
-<<<<<<< HEAD
     def is_to_be_delivered(self):
         """Returns True if the grouped order has not been delivered yet - False if it's old"""
         return self.delivery_date >= timezone.now().date()
 
     def __str__(self):  # pragma: no cover
-=======
-    def __str__(self):
->>>>>>> f6ec481 (install black and format files)
         return (
             self.name
             if self.name
@@ -32,32 +26,20 @@ class GroupedOrder(models.Model):
 
 class Order(models.Model):
     grouped_order = models.ForeignKey(
-<<<<<<< HEAD
         GroupedOrder, on_delete=models.CASCADE, related_name="order_set"
-=======
-        Grouped_order, on_delete=models.CASCADE, related_name="order_set"
->>>>>>> f6ec481 (install black and format files)
     )
     author = models.CharField(
         max_length=100, verbose_name="Personne qui passe la commande"
     )  # a changer, utiliser ForeignKey de user
 
-<<<<<<< HEAD
     def __str__(self):  # pragma: no cover
-=======
-    def __str__(self):
->>>>>>> f6ec481 (install black and format files)
         return f"Commande de {self.author} pour la commande groupée {self.grouped_order.pk}"
 
 
 class Item(models.Model):
     name = models.CharField(max_length=100)
     grouped_order = models.ForeignKey(
-<<<<<<< HEAD
         GroupedOrder, on_delete=models.CASCADE
-=======
-        Grouped_order, on_delete=models.CASCADE
->>>>>>> f6ec481 (install black and format files)
     )  # à transformer en manytomany quand il y aura un catalogue
     ordered_nb = models.IntegerField(default=0)
 
@@ -74,9 +56,5 @@ class OrderedItem(models.Model):
     )
     item = models.ForeignKey(Item, on_delete=models.CASCADE, related_name="orders")
 
-<<<<<<< HEAD
     def __str__(self):  # pragma: no cover
-=======
-    def __str__(self):
->>>>>>> f6ec481 (install black and format files)
         return f"{self.nb} {self.item}, dans la commande {self.order.pk}"
diff --git a/la_chariotte/order/tests/test_models.py b/la_chariotte/order/tests/test_models.py
index 63563bc..e4db427 100644
--- a/la_chariotte/order/tests/test_models.py
+++ b/la_chariotte/order/tests/test_models.py
@@ -30,8 +30,12 @@ class TestGroupedOrdersModel:
         assert ongoing_gr_order.is_ongoing()
 =======
         ongoing_gr_order = Grouped_order(deadline=deadline)
+<<<<<<< HEAD
         assert ongoing_gr_order.is_ongoing() == True
 >>>>>>> 9cc7783 (install pytest)
+=======
+        assert ongoing_gr_order.is_ongoing()
+>>>>>>> 7882cae (install flake8 and check files)
 
     def test_is_ongoing_with_old_grouped_order(self):
         """
diff --git a/setup.cfg b/setup.cfg
index fdfd88b..1183a37 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,2 +1,6 @@
 [tool:pytest]
-DJANGO_SETTINGS_MODULE = la_chariotte.settings
\ No newline at end of file
+DJANGO_SETTINGS_MODULE = la_chariotte.settings
+
+[flake8]
+exclude = migrations
+extend-ignore = E501
\ No newline at end of file