diff --git a/app/views/conflicts/show.json.jbuilder b/app/views/conflicts/show.json.jbuilder
index 281c29e..45b7b38 100644
--- a/app/views/conflicts/show.json.jbuilder
+++ b/app/views/conflicts/show.json.jbuilder
@@ -1 +1 @@
-json.extract! @conflicts_table, :talk_id, :conflicts
+json.merge! @conflicts_table.conflicts