fix merge conflict

src/seedsigner/models/settings.py

@@ -44,7 +44,6 @@ class Settings(Singleton):
 
         settings.init_complete = True
 
-<<<<<<< Updated upstream
     def __config_to_data(self, config):
         self.persistent = config.getboolean("system", "persistent_settings")
         self._data["system"]["debug"] = config.getboolean("system", "debug")
@@ -57,8 +56,6 @@ class Settings(Singleton):
         self.custom_derivation_enabled = config.getboolean("wallet", "custom_derivation_enabled")
         self.custom_derivation = config["wallet"]["custom_derivation"]
 
-=======
->>>>>>> Stashed changes
     ### persistent settings handling
 
     @property