[NEWIMPORT] Fix thinko on insertPlayer

Was returning the player name instead of id in the case where the player exists in the database, but wasn't cached already

Removing some merge gunge too

pyfpdb/Database.py

@@ -1867,8 +1867,10 @@ class Database:
                       ,(name, site_id))
             #Get last id might be faster here.
             #c.execute ("SELECT id FROM Players WHERE name=%s", (name,))
-            tmp = [self.get_last_insert_id(c)]
-        return tmp[0]
+            result = self.get_last_insert_id(c)
+        else:
+            result = tmp[1]
+        return result
 
     def insertGameTypes(self, row):
         c = self.get_cursor()

pyfpdb/SQL.py

@@ -2789,8 +2789,6 @@ class Sql:
                         ,hp.tourneyTypeId
                         ,date_format(h.handStart, 'd%y%m%d')
 """
-#>>>>>>> 28ca49d592c8e706ad6ee58dd26655bcc33fc5fb:pyfpdb/SQL.py
-#"""
         elif db_server == 'postgresql':
             self.query['rebuildHudCache'] = """
                 INSERT INTO HudCache