diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index baf42bfa8c74225576adb357adb3d1aab7cb53ab..853a0fc10121cebcd441b16e5b0c1ffdf1bc7428 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -185,8 +185,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)