  * Fixed a migrations crash with ``GenericForeignKey`` (:ticket:`25040`).
  
  * Made ``translation.override()`` clear the overridden language when a
    translation isn't initially active (:ticket:`25295`).
 
</s> remove     list_display = ('leader', 'country', 'expected')
 </s> add     list_display = ('leader', 'country', 'expected', 'sketch')

    def sketch(self, obj):
        # A method with the same name as a reverse accessor.
        return 'list-display-sketch' </s> remove     if field.is_relation and field.many_to_one and not field.related_model:
 </s> add     if (field.is_relation and
            # Generic foreign keys OR reverse relations
            ((field.many_to_one and not field.related_model) or field.one_to_many)):
* Fixed crash when using a value in ``ModelAdmin.list_display`` that clashed
  with a reverse field on the model (:ticket:`25299`).
  * Fixed a migrations crash with ``GenericForeignKey`` (:ticket:`25040`).
  
  * Made ``translation.override()`` clear the overridden language when a
    translation isn't initially active (:ticket:`25295`).
* Fixed crash when using a value in ``ModelAdmin.list_display`` that clashed
  with a reverse field on the model (:ticket:`25299`).
keep keep keep add
 Fixed #25299 -- Fixed crash with ModelAdmin.list_display value that clashes with a model reverse accessor. 
docs/releases/1.8.5.txt