diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 2c54552b..156fa4ed 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -383,7 +383,7 @@ class fpdb:
         print "todo: implement obtain_global_lock (users: pls ignore this)"
     #end def obtain_global_lock
 
-    def quit(self, widget):
+    def quit(self, widget, data):
         print "Quitting normally"
         #check if current settings differ from profile, if so offer to save or abort
         self.db.disconnect()
@@ -427,8 +427,12 @@ class fpdb:
         ps_tab=new_ps_thread.get_vbox()
         self.add_and_display_tab(ps_tab, "Positional Stats")
 
+<<<<<<< HEAD:pyfpdb/fpdb.py
 
     def tab_main_help(self, widget, data=None):
+=======
+    def tab_main_help(self, widget, data):
+>>>>>>> f0b4d82fa554c678f5df0e847083fb8c3bbd0bfa:pyfpdb/fpdb.py
         """Displays a tab with the main fpdb help screen"""
         #print "start of tab_main_help"
         mh_tab=gtk.Label("""Welcome to Fpdb!
diff --git a/pyfpdb/fpdb_simple.py b/pyfpdb/fpdb_simple.py
index e4471e24..3d519877 100644
--- a/pyfpdb/fpdb_simple.py
+++ b/pyfpdb/fpdb_simple.py
@@ -2686,7 +2686,7 @@ def storeHudCache2(backend, cursor, base, category, gametypeId, hand_start_time,
             # Try to do the update first:
             num = cursor.execute("""UPDATE HudCache
 SET HDs=HDs+%s, street0VPI=street0VPI+%s, street0Aggr=street0Aggr+%s,
-    street0_3BChance=street0_3BChance+%s, street0_3BDone=street0_3BDone+%s,
+    street0_3B4BChance=street0_3B4BChance+%s, street0_3B4BDone=street0_3B4BDone+%s,
     street1Seen=street1Seen+%s, street2Seen=street2Seen+%s, street3Seen=street3Seen+%s,
     street4Seen=street4Seen+%s, sawShowdown=sawShowdown+%s,
     street1Aggr=street1Aggr+%s, street2Aggr=street2Aggr+%s, street3Aggr=street3Aggr+%s,