diff --git a/@GMS/addons/custom_server/init/build.sqf b/@GMS/addons/custom_server/init/build.sqf
index 212b68e..a134246 100644
--- a/@GMS/addons/custom_server/init/build.sqf
+++ b/@GMS/addons/custom_server/init/build.sqf
@@ -1,10 +1,6 @@
 
-<<<<<<< Updated upstream
-#define blck_buildNumber 230  //  Address issues with cleanup of objects
-#define blck_versionNumber 7.02
-#define blck_buildDate "10-5-20"
-=======
+
 #define blck_buildNumber 232  //  Address issues with cleanup of objects
 #define blck_versionNumber 7.03
 #define blck_buildDate "10-12-20"
->>>>>>> Stashed changes
+