diff --git a/CHANGELOG.md b/CHANGELOG.md
index efa637b18..603fb0b5b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -679,8 +679,10 @@ All notable changes to this project will be documented in this file.
 [`expect_fun_call`]: https://rust-lang.github.io/rust-clippy/master/index.html#expect_fun_call
 [`expl_impl_clone_on_copy`]: https://rust-lang.github.io/rust-clippy/master/index.html#expl_impl_clone_on_copy
 [`explicit_counter_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_counter_loop
+[`explicit_false`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_false
 [`explicit_into_iter_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_into_iter_loop
 [`explicit_iter_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_iter_loop
+[`explicit_true`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_true
 [`explicit_write`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_write
 [`extend_from_slice`]: https://rust-lang.github.io/rust-clippy/master/index.html#extend_from_slice
 [`extra_unused_lifetimes`]: https://rust-lang.github.io/rust-clippy/master/index.html#extra_unused_lifetimes
diff --git a/README.md b/README.md
index be54424dc..658b2a70a 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,13 @@
 
 A collection of lints to catch common mistakes and improve your [Rust](https://github.com/rust-lang/rust) code.
 
+<<<<<<< HEAD
 [There are 290 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
+||||||| merged common ancestors
+[There are 291 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
+=======
+[There are 293 lints included in this crate!](https://rust-lang.github.io/rust-clippy/master/index.html)
+>>>>>>> run ./util/dev update_lints
 
 We have a bunch of lint categories to allow you to choose how much Clippy is supposed to ~~annoy~~ help you:
 
diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index 1f4cb2789..8af73a4f9 100644
--- a/clippy_lints/src/lib.rs
+++ b/clippy_lints/src/lib.rs
@@ -565,8 +565,8 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
 
     reg.register_lint_group("clippy::all", Some("clippy"), vec![
         approx_const::APPROX_CONSTANT,
-        assert_checks::EXPLICIT_TRUE,
         assert_checks::EXPLICIT_FALSE,
+        assert_checks::EXPLICIT_TRUE,
         assign_ops::ASSIGN_OP_PATTERN,
         assign_ops::MISREFACTORED_ASSIGN_OP,
         attrs::DEPRECATED_CFG_ATTR,
@@ -944,8 +944,8 @@ pub fn register_plugins(reg: &mut rustc_plugin::Registry<'_>, conf: &Conf) {
 
     reg.register_lint_group("clippy::correctness", Some("clippy_correctness"), vec![
         approx_const::APPROX_CONSTANT,
-        assert_checks::EXPLICIT_TRUE,
         assert_checks::EXPLICIT_FALSE,
+        assert_checks::EXPLICIT_TRUE,
         attrs::DEPRECATED_SEMVER,
         attrs::USELESS_ATTRIBUTE,
         bit_mask::BAD_BIT_MASK,