{% extends "base.html" %} {% block content %}
#{{ conflict.id }}{{ conflict.memory_a_id }} {% if conflict.a_archived_at %}archived{% endif %}
{{ conflict.a_content or "" }}
{{ conflict.memory_b_id }} {% if conflict.b_archived_at %}archived{% endif %}
{{ conflict.b_content or "" }}
{{ conflict.resolution_notes }}
{% endif %}