diff --git a/doc/help/settings.asciidoc b/doc/help/settings.asciidoc
index effe982e0..b58ef6d0f 100644
--- a/doc/help/settings.asciidoc
+++ b/doc/help/settings.asciidoc
@@ -1067,15 +1067,11 @@ Default: +pass:[white]+
 == colors.tabs.selected.even.bg
 Background color of selected even tabs.
 
-<<<<<<< HEAD
 Default: +pass:[black]+
 
 [[colors.tabs.selected.even.fg]]
 == colors.tabs.selected.even.fg
 Foreground color of selected even tabs.
-=======
-Valid values:
->>>>>>> upstream/master
 
 Default: +pass:[white]+
 
diff --git a/qutebrowser/config/configdata.yml b/qutebrowser/config/configdata.yml
index a070d2951..73cfe356a 100644
--- a/qutebrowser/config/configdata.yml
+++ b/qutebrowser/config/configdata.yml
@@ -581,7 +581,7 @@ completion.timestamp_format:
   desc: How to format timestamps (e.g. for the history completion).
 
 completion.web_history_max_items:
-  default: 1000
+  default: -1
   type:
     name: Int
     minval: -1