diff --git a/pairent_backend/pairent_app/serializer.py b/pairent_backend/pairent_app/serializer.py
index 0102180..fe05f1e 100644
--- a/pairent_backend/pairent_app/serializer.py
+++ b/pairent_backend/pairent_app/serializer.py
@@ -1,10 +1,8 @@
 from rest_framework import serializers
 
-<<<<<<< HEAD
-from .models import Apartament, User, PsychTestAnswers
-=======
+from .models import Apartament, User, PsychTestAnswers, AuthToken
 from .models import Apartament, User, AuthToken
->>>>>>> 4f5f817d835f6a53448e7d60bb7591c24c825e96
+
 
 
 class ApartamentListSerializer(serializers.ModelSerializer):