Changed merge() to update()

Changed Config::merge() to Config::update() for sanity sake.