diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70feb952e..ad372eb62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
-<<<<<<< HEAD
 v2.7.0 (FUTURE)
 
+## Enhancements
+
+* [#2902](https://github.com/digitalocean/netbox/issues/2902) - Replace supervisord with systemd
+
 ## Housekeeping
 
 * [#3407](https://github.com/netbox-community/netbox/issues/3407) - Added code coverage reporting to the CI pipeline
@@ -51,7 +54,7 @@ v2.6.2 (2019-08-02)
 
 ## Bug Fixes
 
-* [#3018](https://github.com/netbox-community/netbox/issues/3018) - Components connected via a cable must have an equal number of positions
+* [#3018](https://github.com/netbox-community/netbox/issues/301 8) - Components connected via a cable must have an equal number of positions
 * [#3289](https://github.com/netbox-community/netbox/issues/3289) - Prevent position from being nullified when moving a device to a new rack
 * [#3293](https://github.com/netbox-community/netbox/issues/3293) - Enable filtering device components by multiple device IDs
 * [#3315](https://github.com/netbox-community/netbox/issues/3315) - Enable filtering devices/interfaces by multiple MAC addresses