diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 5f344b2..4bee15b 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -111,11 +111,8 @@ namespace SUNLIGHT_CDKEY
             if (sn_id.Text == "") return;
 
             a= sn_id.Text.Substring(0, 6);
-       
-            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;
+            b=(2255-y).ToString()+(255-m).ToString()+(255-d).ToString();
+>>>>>>>>> Temporary merge branch 2
 
             cdk.Text = a + b + CRCcheck16.ToCRC16(CRCcheck16.StringToHexByte(b), true);
         }