diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index 76fdaf26..804d8ed2 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -175,16 +175,9 @@ class Hud:
             adj = self.adj_seats(self.hand, self.config)
             loc = self.config.get_locations(self.table.site, self.max)
             # TODO: is stat_windows getting converted somewhere from a list to a dict, for no good reason?
-            for i, w in enumerate(self.stat_windows):
-#<<<<<<< HEAD:pyfpdb/Hud.py
-                if not type(w) == int: # how do we get pure ints in this list??
-                    (x, y) = loc[adj[i]]
-                    w.relocate(x, y)
-#=======
-#                (x, y) = loc[adj[i]]
-#                self.stat_windows[w].relocate(x, y)
-#                
-#>>>>>>> 7c0d2eb6c664cfd8122b975e58438cfd158ee398:pyfpdb/Hud.py
+            for i, w in enumerate(self.stat_windows.itervalues()):
+                (x, y) = loc[adj[i]]
+                w.relocate(x, y)
         return True
 
     def on_button_press(self, widget, event):