diff --git a/storagemanager/PoolManager.h b/storagemanager/PoolManager.h
index cbb5d54ba..7c2e8a719 100644
--- a/storagemanager/PoolManager.h
+++ b/storagemanager/PoolManager.h
@@ -22,20 +22,12 @@ public:
 	//! @brief	In the PoolManager's destructor all allocated memory is freed.
 	virtual ~PoolManager();
 
-<<<<<<< HEAD
 	//! @brief LocalPool overrides for thread-safety. Decorator function which
 	//! 	   wraps LocalPool calls with a mutex protection.
 	ReturnValue_t deleteData(store_address_t) override;
 	ReturnValue_t deleteData(uint8_t* buffer, size_t size,
 			store_address_t* storeId = nullptr) override;
-=======
-	//! @brief LocalPool overrides for thread-safety.
-	ReturnValue_t deleteData(store_address_t) override;
-	ReturnValue_t deleteData(uint8_t* buffer, size_t size,
-			store_address_t* storeId = NULL) override;
-	ReturnValue_t modifyData(store_address_t packet_id, uint8_t** packet_ptr,
-				size_t* size) override;
->>>>>>> upstream/master
+
 protected:
 	ReturnValue_t reserveSpace(const uint32_t size, store_address_t* address,
 			bool ignoreFault) override;