lib/chatterbot/config.rb in chatterbot-0.2.7 vs lib/chatterbot/config.rb in chatterbot-0.2.8

@@ -214,18 +214,18 @@
     
     #
     # load in the config from the assortment of places it can be specified.
     def load_config(params={})
       # load the flat-files first
-      @config  = global_config.merge(bot_config).merge(params)
+      @config  = global_config.merge(bot_config)
       @config[:db_uri] ||= ENV["chatterbot_db"] unless ENV["chatterbot_db"].nil?
 
       # if we have a key to load from the DB, do that now
       if @config.has_key?(:db_uri) && @config[:db_uri]
         tmp = db_config
         @config = @config.merge(tmp) unless tmp.nil?
       end
-      @config
+      @config.merge(params)
     end
 
     #
     # write out the config file for this bot
     def store_local_config