diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 73b91db9059ffa4f989a71e21c67004e3b7227a3..9aebb1d4b6c4d2a651e7d317a895e7499a084208 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -193,8 +193,5 @@ Fixed
 .. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b0
 .. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b1
 .. _2.0b2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b2
-<<<<<<< HEAD
-=======
 .. _2.0b3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b3
 .. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0rc1
->>>>>>> e039025 (Update the changelog for 2.0rc1)