diff --git a/install/create_tables-postgres.sql b/install/create_tables-postgres.sql
index 047da6c51..af8fd53b3 100644
--- a/install/create_tables-postgres.sql
+++ b/install/create_tables-postgres.sql
@@ -44,8 +44,6 @@ CREATE TABLE "tblAttributeDefinitions" (
 -- --------------------------------------------------------
 
 -- 
-<<<<<<< HEAD
-=======
 -- Table structure for table `tblUsers`
 -- 
 
@@ -59,7 +57,6 @@ CREATE TABLE "tblRoles" (
 -- --------------------------------------------------------
 
 -- 
->>>>>>> seeddms-6.0.x-postgres
 -- Table structure for table "tblUsers"
 -- 
 
@@ -67,10 +64,7 @@ CREATE TABLE "tblUsers" (
   "id" SERIAL UNIQUE,
   "login" varchar(50) default NULL,
   "pwd" varchar(50) default NULL,
-<<<<<<< HEAD
-=======
   "secret" varchar(50) default NULL,
->>>>>>> seeddms-6.0.x-postgres
   "fullName" varchar(100) default NULL,
   "email" varchar(70) default NULL,
   "language" varchar(32) NOT NULL,
@@ -81,11 +75,7 @@ CREATE TABLE "tblUsers" (
   "pwdExpiration" TIMESTAMP default NULL,
   "loginfailures" INTEGER NOT NULL default '0',
   "disabled" INTEGER NOT NULL default '0',
-<<<<<<< HEAD
   "quota" BIGINT,
-=======
-  "quota" INTEGER,
->>>>>>> seeddms-6.0.x-postgres
   "homefolder" INTEGER default NULL,
   UNIQUE ("login")
 );
@@ -138,11 +128,7 @@ CREATE TABLE "tblUserImages" (
   "id" SERIAL UNIQUE,
   "userID" INTEGER NOT NULL default '0' REFERENCES "tblUsers" ("id") ON DELETE CASCADE,
   "image" TEXT NOT NULL,
-<<<<<<< HEAD
   "mimeType" varchar(100) NOT NULL default ''
-=======
-  "mimeType" varchar(10) NOT NULL default ''
->>>>>>> seeddms-6.0.x-postgres
 ) ;
 
 -- --------------------------------------------------------