diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index a6a84cf..beaed93 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -115,13 +115,23 @@ namespace SUNLIGHT_CDKEY
                 return;
             }else sn_id.BorderBrush = new SolidColorBrush(System.Windows.Media.Color.FromArgb(255, 255, 255, 255));
 
-            a = sn_id.Text.Substring(0, 6);
+            a= sn_id.Text.Substring(0, 6);
+<<<<<<<<< Temporary merge branch 1
+            b=(2255-y).ToString()+(255-m).ToString()+(255-d).ToString();
+>>>>>>>>> Temporary merge branch 2
+=========
        
             my = Convert.ToString(Convert.ToInt32(2255 - y), 16).ToUpper();
             mm = Convert.ToString(Convert.ToInt32(255 - m), 16).ToUpper();
             md = Convert.ToString(Convert.ToInt32(255-d), 16).ToUpper();
             b=my+mm+md;
 
+
+            a= sn_id.Text.Substring(0, 6);
+            b=(2255-y).ToString()+(255-m).ToString()+(255-d).ToString();
+
+>>>>>>>>> Temporary merge branch 2
+
             cdk.Text = a + b + CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(b), true);
         }