From 640d3041ef7f3468b9ff744de8b25e69a89125cf Mon Sep 17 00:00:00 2001
From: Tusooa Zhu <tusooa@kazv.moe>
Date: Sat, 7 Aug 2021 19:24:27 -0400
Subject: [PATCH] Use mergedConfig properly

---
 src/components/conversation/conversation.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 858a9ddb..8e4eda51 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -77,7 +77,7 @@ const conversation = {
       return 4
     },
     displayStyle () {
-      return this.$store.state.config.conversationDisplay || 'simple_tree'
+      return this.$store.getters.mergedConfig.conversationDisplay
     },
     isTreeView () {
       return this.displayStyle === 'tree' || this.displayStyle === 'simple_tree'