solving merge conflict

config/database/postgres/create-schemas.sql

@@ -5,10 +5,9 @@ CREATE TABLE COLLABORATOR (
 );
 
 CREATE TABLE "user" (
-  id                  SERIAL       NOT NULL PRIMARY KEY,
   authentication_type TEXT         NOT NULL,
   authenticator_uri   VARCHAR(255),
-  colaborator_id      INTEGER      NOT NULL,
+  colaborator_id      INTEGER      NOT NULL PRIMARY KEY,
   firstname           VARCHAR(255) NOT NULL,
   lastname            VARCHAR(255) NOT NULL,
   password            VARCHAR(255) NOT NULL,
@@ -89,7 +88,8 @@ CREATE TABLE TAG (
 CREATE TABLE ACCESS_AUDITORY (
   id         SERIAL  NOT NULL PRIMARY KEY,
   login_date DATE,
-  user_id    INTEGER NOT NULL
+  user_id    INTEGER NOT NULL,
+  FOREIGN KEY (user_id) REFERENCES "user" (colaborator_id) ON DELETE CASCADE ON UPDATE NO ACTION
 );