diff --git a/bsp_q7s/memory/SdCardManager.h b/bsp_q7s/memory/SdCardManager.h
index f49bbef4..37660f75 100644
--- a/bsp_q7s/memory/SdCardManager.h
+++ b/bsp_q7s/memory/SdCardManager.h
@@ -24,11 +24,7 @@ class MutexIF;
  * @brief   Manages handling of SD cards like switching them on or off or getting the current
  *          state
  */
-<<<<<<< HEAD
-class SdCardManager : public SystemObject {
-=======
 class SdCardManager : public SystemObject, public SdCardMountedIF {
->>>>>>> mueller/plpcdu-sus-updates
   friend class SdCardAccess;
 
  public: