diff --git a/actix-rt/CHANGES.md b/actix-rt/CHANGES.md
index 3e8be59b..35409616 100644
--- a/actix-rt/CHANGES.md
+++ b/actix-rt/CHANGES.md
@@ -22,7 +22,6 @@
 [#207]: https://github.com/actix/actix-net/pull/207
 [#236]: https://github.com/actix/actix-net/pull/236
 
-
 ## [1.1.1] - 2020-04-30
 
 ### Fixed
diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md
index 646c5b64..75e65c66 100644
--- a/actix-server/CHANGES.md
+++ b/actix-server/CHANGES.md
@@ -1,19 +1,9 @@
 # Changes
 
 ## Unreleased - 2020-xx-xx
-<<<<<<< HEAD
-* Update `mio` dependency to 0.7.3.
-* Remove `socket2` dependency.
-* `ServerBuilder::backlog` would accept `u32` instead of `i32`.
-* Use `concurrent-queue` to manage poll wakes instead of `futures::channel::mpsc::unbounded`.
-* Remove `AcceptNotify` type and pass `WakerQueue` to `Worker` for wake up the `Accept`'s `Poll`.
-* Convert `mio::net::TcpStream` to `actix_rt::net::TcpStream`(`UnixStream` for uds) using `FromRawFd` and `IntoRawFd`(`FromRawSocket` and `IntoRawSocket` on windows).
-* Remove `AsyncRead` and `AsyncWrite` trait bound for `socket::FromStream` trait. 
-=======
 * Merge `actix-testing` to `actix-server` as `test_server` mod.
 
 ## 2.0.0-beta.1 - 2020-12-28
->>>>>>> upstream/master
 * Added explicit info log message on accept queue pause. [#215]
 * Prevent double registration of sockets when back-pressure is resolved. [#223]
 * Update `mio` dependency to `0.7.3`. [#239]
diff --git a/string/CHANGES.md b/string/CHANGES.md
index bd357a45..e66f81cd 100644
--- a/string/CHANGES.md
+++ b/string/CHANGES.md
@@ -1,7 +1,7 @@
 # Changes
 
 ## Unreleased - 2020-xx-xx
-* Update `bytes` dependency to 0.6
+* Update `bytes` dependency to `1`
 
 ## [0.1.5] - 2020-03-30