diff --git a/devicehandlers/DeviceHandlerBase.h b/devicehandlers/DeviceHandlerBase.h
index c48fbe5e..454f0751 100644
--- a/devicehandlers/DeviceHandlerBase.h
+++ b/devicehandlers/DeviceHandlerBase.h
@@ -614,11 +614,7 @@ protected:
 	/**
 	 * Cookie used for communication
 	 */
-<<<<<<< HEAD
-	CookieIF * comCookie = nullptr;
-=======
 	CookieIF * comCookie;
->>>>>>> mueller_framework
 
 	struct DeviceCommandInfo {
 		bool isExecuting; //!< Indicates if the command is already executing.