diff --git a/backend/core/serializers.py b/backend/core/serializers.py
index c58def5252afb5857ea890a62bb5b31f6f561e72..17564bb85dbe8e6c728024a218d3bc049c2455e1 100644
--- a/backend/core/serializers.py
+++ b/backend/core/serializers.py
@@ -2,7 +2,6 @@ from rest_framework import serializers
 from core.models import Student, Submission, Feedback, ExamType
 
 from core.models import Feedback, Student, Submission
-=======
 from rest_framework import serializers
 from core.models import Student, Submission, Feedback, ExamType
 
@@ -11,7 +10,6 @@ class ExamSerializer(serializers.ModelSerializer):
     class Meta:
         model = ExamType
         fields = ('module_reference', 'total_score', 'pass_score', 'pass_only',)
->>>>>>> First step towards REST + Vue Student Page
 
 
 class FeedbackSerializer(serializers.ModelSerializer):
diff --git a/backend/core/urls.py b/backend/core/urls.py
index 962f668183ba4a1bcbd47e69aabc49561a2c2e6e..f9b3345c6525e001776fd15597397f103d2dcf9b 100644
--- a/backend/core/urls.py
+++ b/backend/core/urls.py
@@ -13,4 +13,3 @@ urlpatterns = [
 ]
 
 urlpatterns += staticfiles_urlpatterns()
-urlpatterns = format_suffix_patterns(urlpatterns, allowed=['json', 'html'])