diff --git a/flashcards/views.py b/flashcards/views.py
index 955d14e..dd41f2c 100644
--- a/flashcards/views.py
+++ b/flashcards/views.py
@@ -30,13 +30,8 @@ class SectionViewSet(ReadOnlyModelViewSet):
         Gets flashcards for a section, excluding hidden cards.
         Returned in strictly chronological order (material date).
         """
-<<<<<<< HEAD
         flashcards = Flashcard.cards_visible_to(request.user).filter( \
             section=self.get_object()).all()
-
-=======
-        flashcards = Flashcard.cards_visible_to(request.user).filter(section=self.get_object())
->>>>>>> 41819dd7ec2f22a04db83459c33e31c2b7d16d99
         return Response(FlashcardSerializer(flashcards, many=True).data)
 
     @detail_route(methods=['post'], permission_classes=[IsAuthenticated])