diff --git a/webfit/data/models.py b/webfit/data/models.py
index fba2f232a3..55a7f3465b 100644
--- a/webfit/data/models.py
+++ b/webfit/data/models.py
@@ -57,11 +57,8 @@ class Data(models.Model):
     ]
 
     public_file_ids = [
-<<<<<<< HEAD
 
-=======
         
->>>>>>> 78158ec23b861429bec242bbe70ab845bc32fa22
     ]
 
     analysis = models.ForeignKey("AnalysisBase.id", on_delete=models.CASCADE)