diff --git a/setup.py b/setup.py
index 068f290f7db681e615513eedaebeee220a0041d3..5a60f1369fdd470c88ba501046056486e6e45962 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
+>>>>>>> b44b21747f7cf1d8d6aca5ca749809826df6c4f7
 
 from setuptools import setup
 from setuptools import find_packages