diff --git a/hsarback/database/database_update.sql b/hsarback/database/database_update.sql
index ae88441..9789373 100644
--- a/hsarback/database/database_update.sql
+++ b/hsarback/database/database_update.sql
@@ -54,7 +54,10 @@ ALTER TABLE component
 
 ALTER TABLE packet DROP COLUMN order_number;
 ALTER TABLE packet DROP COLUMN webserver_group;
+<<<<<<< HEAD
 ALTER TABLE packet ADD COLUMN free boolean NOT NULL DEFAULT false;
+=======
+>>>>>>> branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git
 
 ALTER TABLE domain DROP COLUMN domain_status;
 ALTER TABLE domain DROP COLUMN domain_status_changed;