diff --git a/CHANGELOG.md b/CHANGELOG.md
index 305518965..86b3e11b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -246,7 +246,10 @@ Look at the [release tags] for information about older releases.
 
 [Unreleased]: https://github.com/rust-lang-nursery/log/compare/0.4.18...HEAD
 [0.4.19]: https://github.com/rust-lang-nursery/log/compare/0.4.18...0.4.19
+<<<<<<< HEAD
 [0.4.18]: https://github.com/rust-lang-nursery/log/compare/0.4.17...0.4.18
+=======
+>>>>>>> 4c4a0b3 (prepare for 0.4.19 release)
 [0.4.17]: https://github.com/rust-lang-nursery/log/compare/0.4.16...0.4.17
 [0.4.16]: https://github.com/rust-lang-nursery/log/compare/0.4.15...0.4.16
 [0.4.15]: https://github.com/rust-lang-nursery/log/compare/0.4.13...0.4.15
diff --git a/Cargo.toml b/Cargo.toml
index eabb2c4fb..fa9ef428b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "log"
-version = "0.4.18" # remember to update html_root_url
+version = "0.4.19" # remember to update html_root_url
 authors = ["The Rust Project Developers"]
 license = "MIT OR Apache-2.0"
 readme = "README.md"
diff --git a/src/lib.rs b/src/lib.rs
index c669206a4..e6a41d9c2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -317,7 +317,7 @@
 #![doc(
     html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
     html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-    html_root_url = "https://docs.rs/log/0.4.18"
+    html_root_url = "https://docs.rs/log/0.4.19"
 )]
 #![warn(missing_docs)]
 #![deny(missing_debug_implementations, unconditional_recursion)]