diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 6a992a9..cb974bc 100644
--- a/MAIN_SSG.rdx
+++ b/MAIN_SSG.rdx
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PROCESS Id="RDK:0001" Name="MAIN_SSG" ModernUI="True" Options="(GITSAVEMODE)(NOUPDATEINCLUDEFILES)" Expanded="True">
+<<<<<<< HEAD
 	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="s.schmutzler [ANGEBOT-NB06]" ModDate="2024-06-10T12:33:13" LanguageVersion="2014.1.3.673" />
+=======
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="dre [NBDELP3561-04C]" ModDate="2024-06-10T11:25:19" LanguageVersion="2014.1.3.674" />
+>>>>>>> 520101739a126423e5d3ce5c376e8d293a3f2205
 	<GROUP Id="RDK:0002" Name="Declarations" SubType="Declarations" Expanded="True">
 		<GROUP Id="RDK:0003" Name="Types" SubType="TypeSet" IncludeDate="0">
 			<GROUP Id="RDK:26387" Name="SSG_Group" SubType="TypeSet" IncludeDate="0">
@@ -1051,7 +1055,7 @@
 							<EXP><![CDATA[$C$90]]></EXP>
 						</PAR>
 						<PAR Name="PageScaleFactor">
-							<EXP><![CDATA[$=$"1:"+ImportBackgroundData.Scale]]></EXP>
+							<EXP><![CDATA[$=$"1:"+GlobalScaleFactor]]></EXP>
 						</PAR>
 						<PAR Name="PageSnapToGrid">
 							<EXP><![CDATA[$C$True]]></EXP>
@@ -1633,6 +1637,8 @@
 											<PAR Name="IDCounter" />
 											<PAR Name="BTMTBeladungDefinition" />
 											<PAR Name="BTMTEntladungDefinition" />
+											<PAR Name="StreckeDefinition" />
+											<PAR Name="FoerdererDefinition" />
 										</SET_STRUCT>
 										<REMOVE_ADD Id="RDK:639233" Suppressed="True" ListRef="ShapeList" Expr="Me.behaviour=&quot;(BACKGROUND)&quot;">
 											<EXP />