diff --git a/names/sereres.dat b/names/sereres.dat
index 4ded5e03b98989e1e5af114949e514bde7856aae..0857521c7420e95fd0831adec585b2964e951fd2 100644
--- a/names/sereres.dat
+++ b/names/sereres.dat
@@ -1,4 +1,7 @@
+<<<<<<< HEAD
 creating conflict
 
+=======
+>>>>>>> develop
 01110011 01100101 01110010 01100101 01110010 01100101 01110011