diff --git a/sim/detectors/mvd/CbmMvdPixelCharge.h b/sim/detectors/mvd/CbmMvdPixelCharge.h
index 72b92da7cbb7cffcff07fa7ef623ac4f4cf05a53..e05dde12a80f3a8307725acc2b42c78735ba97e7 100644
--- a/sim/detectors/mvd/CbmMvdPixelCharge.h
+++ b/sim/detectors/mvd/CbmMvdPixelCharge.h
@@ -80,4 +80,8 @@ private:
   ClassDef(CbmMvdPixelCharge, 1);
 };
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> 85e08e45 (Create separate simulation library from mvd code)
 #endif