diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql
index cb0037dd9..c347d827b 100644
--- a/db/dump/fixtures.sql
+++ b/db/dump/fixtures.sql
@@ -2715,7 +2715,6 @@ UPDATE `account`.`user`
     SET `hasGrant` = 1
         WHERE `id` = 66;
 
-<<<<<<< HEAD
 INSERT INTO `postgresql`.`journey` (`journey_id`, `day_id`, `start`, `end`, `business_id`)
 VALUES
     (1, 1, '09:00:00', '13:00:00', 18),
@@ -2730,8 +2729,6 @@ VALUES
     (10, 4, '07:00:00', '14:00:00', 19),
     (11, 5, '08:00:00', '13:00:00', 19);
 
-=======
 INSERT INTO `vn`.`osTicketConfig` (`id`, `host`, `user`, `password`, `oldStatus`, `newStatusId`, `day`, `comment`, `hostDb`, `userDb`, `passwordDb`, `portDb`, `responseType`, `fromEmailId`, `replyTo`)
     VALUES
         (0, 'http://localhost:56596/scp', 'ostadmin', 'Admin1', 'open', 3, 60, 'Este CAU se ha cerrado automáticamente. Si el problema persiste responda a este mensaje.', 'localhost', 'osticket', 'osticket', 40003, 'reply', 1, 'all');
->>>>>>> 6ed5ef7d1b79034791af9ecba79ecb9e3194b1ee