diff --git a/@GMS/addons/custom_server/init/build.sqf b/@GMS/addons/custom_server/init/build.sqf
index af70ecc..0db7ca8 100644
--- a/@GMS/addons/custom_server/init/build.sqf
+++ b/@GMS/addons/custom_server/init/build.sqf
@@ -1,12 +1,6 @@
 private ["_version","_versionDate"];
-<<<<<<< HEAD
-blck_version = "6.80 Build 117";
-_blck_version = blck_version;
-_blck_versionDate = "3-3-18  7:00 PM";
-=======
 blck_version = "6.80 Build 118";
 _blck_version = blck_version;
-_blck_versionDate = "3-3-18  7:00 AM";
->>>>>>> Experimental
+_blck_versionDate = "3-5-18  7:00 AM";
 blck_pvs_version = _blck_version;
 publicVariable blck_pvs_version;