diff --git a/MAIN_SSG.rdx b/MAIN_SSG.rdx
index 44bc83d..3b2e6bd 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="y.wang [ANGEBOT-NB02]" ModDate="2025-09-19T13:34:33" LanguageVersion="2014.1.3.698" />
+=======
+	<PROCESSPROPERTY CrUser="pmarani [ENGMARANI17R]" CrDate="2022-05-05T18:05:31" ModUser="p.wolok [AZUBI-NB10]" ModDate="2025-09-19T10:21:37" LanguageVersion="2014.1.3.712" />
+>>>>>>> 9692ac9efd1fa0499d75add796c129c5572208e6
 	<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">
@@ -38162,7 +38166,7 @@ me.x
 						<EXP><![CDATA[$=$Shape_Prototype.family+" :"+Shape_Prototype.IDCounter]]></EXP>
 						<PAR Name="AdvancedOptions" />
 					</SET>
-					<IFTHENELSE Id="RDK:1692933">
+					<IFTHENELSE Id="RDK:1692933" Suppressed="True">
 						<VALUECONDITION Value="true">
 							<EXP><![CDATA[$=$ShapeList["id="+ID].family="Kreisel"]]></EXP>
 						</VALUECONDITION>
@@ -38174,8 +38178,8 @@ me.x
 						</GROUP>
 						<GROUP Id="RDK:1692935" SubType="Else" />
 					</IFTHENELSE>
-					<SELECTCASE Id="RDK:1690659" Suppressed="True">
-						<EXP><![CDATA[$C$ShapeList["id="+ID].family]]></EXP>
+					<SELECTCASE Id="RDK:1690659">
+						<EXP><![CDATA[$=$ShapeList["id="+ID].family]]></EXP>
 						<CASEGROUP Id="RDK:1690660" CaseType="0">
 							<EXP><![CDATA[$C$Kreisel]]></EXP>
 							<CALLFUNCTION Id="RDK:1667887" Suppressed="True">
@@ -38190,14 +38194,14 @@ me.x
 								</PAR>
 								<PAR Name="Options" />
 							</CALLFUNCTION>
-							<SET Id="RDK:1691232" VarRef="ShapeList[&quot;id=&quot;+ID].KreiselDefinition.Beschreibung" Suppressed="True">
+							<SET Id="RDK:1691232" VarRef="ShapeList[&quot;id=&quot;+ID].KreiselDefinition.Beschreibung">
 								<EXP><![CDATA[$=$Shape_Prototype.family+" :"+Shape_Prototype.IDCounter]]></EXP>
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</CASEGROUP>
 						<CASEGROUP Id="RDK:1691228" CaseType="0">
 							<EXP><![CDATA[$C$Gefaellestrecke]]></EXP>
-							<CALLFUNCTION Id="RDK:20657449">
+							<CALLFUNCTION Id="RDK:20657449" Suppressed="True">
 								<PAR Name="FuncName">
 									<EXP><![CDATA[$C$CreatePrototype_Gefaellestrecke]]></EXP>
 								</PAR>
@@ -38214,9 +38218,22 @@ me.x
 								<PAR Name="AdvancedOptions" />
 							</SET>
 						</CASEGROUP>
+						<CASEGROUP Id="RDK:25738767" CaseType="0">
+							<EXP><![CDATA[$C$OFGerade]]></EXP>
+							<CALLFUNCTION Id="RDK:25738769">
+								<PAR Name="FuncName">
+									<EXP><![CDATA[$C$WriteCPsFromDataToPrototype_OFGerade]]></EXP>
+								</PAR>
+								<PAR Name="InputExp" />
+								<PAR Name="ResultRef">
+									<EXP><![CDATA[$V$]]></EXP>
+								</PAR>
+								<PAR Name="Options" />
+							</CALLFUNCTION>
+						</CASEGROUP>
 						<CASEGROUP Id="RDK:1690661" CaseType="1">
 							<EXP />
-							<COMMENTS Id="RDK:1692364" DesignTimeRemark="ShapeList[&quot;id=&quot;+ID].family" DesignTimeTip="test" />
+							<COMMENTS Id="RDK:1692364" Suppressed="True" DesignTimeRemark="ShapeList[&quot;id=&quot;+ID].family" DesignTimeTip="test" />
 						</CASEGROUP>
 					</SELECTCASE>
 					<CALLFUNCTION Id="RDK:1668452">