diff --git a/sample_project/app/models.py b/sample_project/app/models.py
index 7fcc520..bf8b563 100644
--- a/sample_project/app/models.py
+++ b/sample_project/app/models.py
@@ -181,10 +181,5 @@ class SortableNonInlineCategory(SimpleModel, Sortable):
         verbose_name = 'Sortable Non-Inline Category'
         verbose_name_plural = 'Sortable Non-Inline Categories'
 
-<<<<<<< HEAD
-=======
-    non_sortable_category = SortableForeignKey(NonSortableCategory)
-
->>>>>>> e83e31cb22c681d4ddd954e993a9c2a129486ad4
     def __str__(self):
         return self.title