diff --git a/DOCKER.md b/DOCKER.md
index fee7cae5..3203938a 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -24,14 +24,14 @@ Let say USER in the docker image is 10000 and name is odoo
 - Grant access to the user to potgresql (this example give admin access, be carefull)
     sudo -u postgres createuser -d -R -S runbot
 
-- edit  /etc/postgresql/14/main/pg_ident.conf and add this line 
+- edit  /etc/postgresql/14/main/pg_ident.conf and add thoses lines 
     runbot runbot odoo
     runbot odoo odoo
 
 - edit  /etc/postgresql/14/main/pg_hba.conf and change this line 
+    local   all             odoo                                     peer map=runbot
+before this line
     local   all             all                                     peer
-with this line
-    local   all             all                                     peer map=runbot
 
 
 Finally, add the volume when stating the docker 
diff --git a/runbot.tar.gz b/runbot.tar.gz
new file mode 100644
index 00000000..88d5fd5c
Binary files /dev/null and b/runbot.tar.gz differ
diff --git a/runbot.tar.gz.1 b/runbot.tar.gz.1
new file mode 100644
index 00000000..88d5fd5c
Binary files /dev/null and b/runbot.tar.gz.1 differ
diff --git a/runbot/models/build_error.py b/runbot/models/build_error.py
index 794cbd0b..4d6f133a 100644
--- a/runbot/models/build_error.py
+++ b/runbot/models/build_error.py
@@ -23,7 +23,11 @@ class BuildErrorLink(models.Model):
     _order = 'log_date desc, build_id desc'
 
     build_id = fields.Many2one('runbot.build', required=True, index=True)
+<<<<<<< HEAD
     error_content_id = fields.Many2one('runbot.build.error.content', required=True, index=True, ondelete='cascade')
+=======
+    build_error_id = fields.Many2one('runbot.build.error', required=True, index=True, ondelete='cascade')
+>>>>>>> 2774ecf9 (wip)
     log_date = fields.Datetime(string='Log date')
     host = fields.Char(related='build_id.host')
     dest = fields.Char(related='build_id.dest')