fix: fix conflicts

apps/accounts/serializers/account/account.py

@@ -385,10 +385,7 @@ class AccountHistorySerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Account.history.model
-        fields = [
+        fields = ['id', 'secret', 'secret_type', 'version', 'history_date', 'history_user']
-            'id', 'secret', 'secret_type', 'version',
-            'history_date', 'history_user'
-        ]
         read_only_fields = fields
         extra_kwargs = {
             'history_user': {'label': _('User')},