diff --git a/ItemPool.py b/ItemPool.py
index 74a5428a..03fefd03 100644
--- a/ItemPool.py
+++ b/ItemPool.py
@@ -470,11 +470,7 @@ def create_dynamic_shop_locations(world, player):
                 if item is None:
                     continue
                 if item['create_location']:
-<<<<<<< HEAD
-                    loc = Location(player, "{} Slot Item {}".format(shop.region.name, i+1), parent=shop.region)
-=======
                     loc = Location(player, "{} Shop Slot {}".format(shop.region.name, i+1), parent=shop.region)
->>>>>>> ffe5b4b1a1d806c09a1be91a283dd3a6cdbcaafa
                     shop.region.locations.append(loc)
                     world.dynamic_locations.append(loc)
 
diff --git a/host.yaml b/host.yaml
index cabacd4f..33e749d0 100644
--- a/host.yaml
+++ b/host.yaml
@@ -13,13 +13,13 @@ general_options:
 # Null means nothing, for the server this means to default the value
 # These overwrite command line arguments!
 server_options:
-  host: 0.0.0.0
+  host: null
   port: 38281
   password: null
   multidata: null
   savefile: null
   disable_save: false
-  loglevel: "debug"
+  loglevel: "info"
   # Allows for clients to log on and manage the server.  If this is null, no remote administration is possible.
   server_password: null
   # Automatically forward the port that is used, then close that port after 24 hours
@@ -28,9 +28,9 @@ server_options:
   disable_item_cheat: false
   # Client hint system
   # Points given to a player for each acquired item in their world
-  location_check_points: 50
+  location_check_points: 1
   # Point cost to receive a hint via !hint for players
-  hint_cost: 0 # Set to 0 if you want free hints
+  hint_cost: 1000 # Set to 0 if you want free hints
   # Forfeit modes
   # "disabled" -> clients can't forfeit,
   # "enabled" -> clients can always forfeit