diff --git a/hsarback/database/dropschema.sql b/hsarback/database/dropschema.sql
index 9b3690e..c6f5844 100644
--- a/hsarback/database/dropschema.sql
+++ b/hsarback/database/dropschema.sql
@@ -35,4 +35,8 @@ DROP SEQUENCE hive_hive_id_seq ;
 DROP TABLE inet_addr ;
 DROP SEQUENCE inet_addr_inet_addr_id_seq ;
 DROP TABLE business_partner CASCADE ;
+<<<<<<< HEAD
 DROP SEQUENCE business_partner_bp_id_seq ;
+=======
+
+>>>>>>> branch 'master' of ssh://hsh04-source@hsh04.hostsharing.net/home/doms/source.hostsharing.net/source/hsadmin.git