diff --git a/pyfpdb/Hud.py b/pyfpdb/Hud.py
index e2147517..66655c9a 100644
--- a/pyfpdb/Hud.py
+++ b/pyfpdb/Hud.py
@@ -224,13 +224,9 @@ class Hud:
         game_params = config.get_game_parameters(self.poker_game)
         if not game_params['aux'] == "":
             aux_params = config.get_aux_parameters(game_params['aux'])
-<<<<<<< HEAD:pyfpdb/Hud.py
             self.aux_windows.append(eval("%s.%s(gtk.Window(), self, config, 'fpdb')" % (aux_params['module'], aux_params['class'])))
-=======
-            self.aux_windows.append(eval("%s.%s(gtk.Window(), config, 'fpdb')" % (aux_params['module'], aux_params['class'])))
         
         gobject.timeout_add(0.5, self.update_table_position)
->>>>>>> f607b3ff632a015de2cdbe2a92f706d90b116458:pyfpdb/Hud.py
             
     def update(self, hand, config, stat_dict):
         self.hand = hand   # this is the last hand, so it is available later