diff --git a/setup.py b/setup.py
index 068f290f7db681e615513eedaebeee220a0041d3..7b0e92baae4abb0bbf69be799952ce32dcdbc439 100644
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,10 @@
 # -*- coding: utf-8 -*-
+<<<<<<< HEAD
 """Installer for Spot package."""
+=======
+"""Installer for Searx package."""
+# Test auto sync
+>>>>>>> 06e179d0f1696b3dc6a66d1d01c178fcfafed5e5
 
 from setuptools import setup
 from setuptools import find_packages
diff --git a/test.md b/test.md
new file mode 100644
index 0000000000000000000000000000000000000000..802992c4220de19a90767f3000a79a31b98d0df7
--- /dev/null
+++ b/test.md
@@ -0,0 +1 @@
+Hello world