diff --git a/DMS_init.sqf b/DMS_init.sqf
index debea89..239a0f4 100644
--- a/DMS_init.sqf
+++ b/DMS_init.sqf
@@ -21,8 +21,13 @@ if(isServer) then {
 	//DMS_MissionMax 		= 120; // Timers in seconds
 	// CONFIGS
 
+<<<<<<< HEAD
 
 	uiSleep 2;
+=======
+	call DMS_selectMission;
+	
+>>>>>>> origin/master
 	
 	//[] call compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_selectMission.sqf";
 	//[] execVM "\x\addons\dms\scripts\DMS_selectMission.sqf";
diff --git a/scripts/DMS_selectMission.sqf b/scripts/DMS_selectMission.sqf
index 95867d0..ed37f80 100644
--- a/scripts/DMS_selectMission.sqf
+++ b/scripts/DMS_selectMission.sqf
@@ -1,4 +1,4 @@
-DMS_SelectMission = {
+
 	private ["_sleepTime","_run","_countArray","_randomMiss","_missVar","_minTime","_maxTime","_missionFnc","_MainArray"];
 	// First we add the array of missions
 	_MainArray = ["MM1","MM2","MM3","MM4","MM5","MM6","MM7","MM8","MM9","MM10"];
@@ -22,4 +22,3 @@ DMS_SelectMission = {
 	call compile preprocessfilelinenumbers format["\x\addons\dms\missions\%1.sqf",_missVar];
 
 	//DMS_MissionRunning = 1;
-};