diff --git a/marlo-data/src/main/resources/hibernate.cfg.xml b/marlo-data/src/main/resources/hibernate.cfg.xml
index 037211c1bf..0d9b49178c 100644
--- a/marlo-data/src/main/resources/hibernate.cfg.xml
+++ b/marlo-data/src/main/resources/hibernate.cfg.xml
@@ -429,15 +429,12 @@
   <mapping resource="xmls/ProjectExpectedStudyReferences.hbm.xml"/>
   <mapping resource="xmls/DeliverableClusterParticipants.hbm.xml"/>
   <mapping resource="xmls/DeliverableTraineesIndicators.hbm.xml"/>
-<<<<<<< HEAD
   <mapping resource="xmls/TipParameters.hbm.xml"/>
-=======
   <mapping resource="xmls/ShfrmPriorityActions.hbm.xml"/>
   <mapping resource="xmls/ShfrmSubActions.hbm.xml"/>
   <mapping resource="xmls/DeliverableShfrmPriorityActions.hbm.xml"/>
   <mapping resource="xmls/DeliverableShfrmSubActions.hbm.xml"/>
   <mapping resource="xmls/SoilIndicators.hbm.xml"/>
->>>>>>> aiccra-shfrm-contribution-functionality
 
  </session-factory>
 </hibernate-configuration>