diff --git a/src/modules/config.js b/src/modules/config.js
index eb2df541..71f71376 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -30,13 +30,8 @@ const defaultState = {
   interfaceLanguage: browserLocale,
   scopeCopy: undefined, // instance default
   subjectLineBehavior: undefined, // instance default
-<<<<<<< HEAD
-  alwaysShowSubjectInput: undefined // instance default
-=======
   alwaysShowSubjectInput: undefined, // instance default
-  showFeaturesPanel: true,
   postContentType: undefined // instance default
->>>>>>> da0a5535eb09f6637df921a8a5f951c295bedeac
 }
 
 const config = {