diff --git a/searx/engines/startpage.py b/searx/engines/startpage.py
index f2afc149c..340b422ee 100644
--- a/searx/engines/startpage.py
+++ b/searx/engines/startpage.py
@@ -114,11 +114,19 @@ def request(query, params):
     #
     # [1] https://addons.mozilla.org/en-US/firefox/addon/startpage-private-search/
 
+<<<<<<< HEAD
     # set safesearch
     family = ''
     if params['safesearch'] == 0:
         family += '26edcb9d2db7168438f47a16f48020b9b73edd4a5fcaba97fb11ce8497dd03cdab5b7b508ab460c642ebc4b8477d08d78cd0d3da8251a5b51b03aada722a0f62ef8c78b2ead007b6c7a7ac'
 
+=======
+    #set safesearch
+    family = ''
+    if params['safesearch'] == 0:
+        family += '26edcb9d2db7168438f47a16f48020b9b73edd4a5fcaba97fb11ce8497dd03cdab5b7b508ab460c642ebc4b8477d08d78cd0d3da8251a5b51b03aada722a0f62ef8c78b2ead007b6c7a7ac'
+        
+>>>>>>> origin/patch-1
     args = {
         'query': query,
         'page': params['pageno'],