diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35adddc9..1d52487e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -73,7 +73,6 @@ eive-tmtc: v2.12.6
 - Function for the ACS controller to command MTQ and RWs called by all subroutines
 - RwHandler now handles commanding of RW speeds via RwSpeedActuationSet
 - Tracing supports which allows checking whether threads are running as usual.
->>>>>>> origin/develop
 
 ## Changed
 
@@ -160,16 +159,13 @@ eive-tmtc: v2.12.2
 ## Changed
 
 - Reworked dummy handling for the TCS controller.
-<<<<<<< HEAD
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/325
-=======
 - Generator scripts now generate files for hosted and for Q7S build.
 
 ## Fixed
 
 - GPS Controller: Set fix value to 0 when switching off to allow
   `GPS_FIX_CHANGE` to work when switching the GPS back on.
->>>>>>> origin/develop
 
 # [v1.26.2] 2023-02-08
 
@@ -382,10 +378,6 @@ Syrlinks PR: PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/353
   it has a submode for low datarate (1) and high datarate (2) for the ON command.
   PR: https://egit.irs.uni-stuttgart.de/eive/eive-obsw/pulls/352
 
-## Added
-
-- Startracker temperature set and PCDU switcher set are diagnostic now
-
 # [v1.20.0] 2023-01-24
 
 ## Added