diff --git a/pyfpdb/fpdb.py b/pyfpdb/fpdb.py
index 3e0b4337..36ff556f 100755
--- a/pyfpdb/fpdb.py
+++ b/pyfpdb/fpdb.py
@@ -267,7 +267,6 @@ class fpdb:
             self.settings['db-databaseName'],
             self.settings['db-user'], 
             self.settings['db-password'])
-<<<<<<< HEAD:pyfpdb/fpdb.py
         if self.db.wrongDbVersion:
             diaDbVersionWarning = gtk.Dialog(title="Strong Warning - Invalid database version", parent=None, flags=0, buttons=(gtk.STOCK_OK,gtk.RESPONSE_OK))