diff --git a/src/fsfw/util/dataWrapper.h b/src/fsfw/util/dataWrapper.h
index bd69a787..84a9814f 100644
--- a/src/fsfw/util/dataWrapper.h
+++ b/src/fsfw/util/dataWrapper.h
@@ -59,12 +59,8 @@ struct DataWrapper {
     }
     return false;
   }
-<<<<<<< HEAD
 
-  void setRawData(BufPairT bufPair) {
-=======
   void setRawData(BufPair bufPair) {
->>>>>>> upstream/mueller/data-wrapper
     type = DataTypes::RAW;
     dataUnion.raw.data = bufPair.first;
     dataUnion.raw.len = bufPair.second;