diff --git a/Projects/SAMufasaGUI/testunit.pas b/Projects/SAMufasaGUI/testunit.pas
index c18216d..8d70192 100644
--- a/Projects/SAMufasaGUI/testunit.pas
+++ b/Projects/SAMufasaGUI/testunit.pas
@@ -1418,21 +1418,41 @@ var
   ErrorMsg : string;
 begin
   DoRun := false;
+<<<<<<< HEAD
+=======
+  // paramcount = 1 means we got only one parameter. We assume this to be a file.
+  // and try to open it accordingly
+>>>>>>> c8103490d871d7f0c46c3bbf5d9a954a2be64c97
   if (Paramcount = 1) and not (Application.HasOption('open')) then
   begin
+    writeln('Opening file: ' + ParamStr(1));
     if FileExists(ParamStr(1)) then
+    begin
       LoadScriptFile(paramstr(1));
+    end;
   end else
+<<<<<<< HEAD
   begin;
     ErrorMsg:=Application.CheckOptions('ro:',['run','open:']);
+=======
+  // we have more parameters. Check for specific options. (-r -o, --run --open)
+  begin
+    ErrorMsg:=Application.CheckOptions('ro:',['run', 'open:']);
+>>>>>>> c8103490d871d7f0c46c3bbf5d9a954a2be64c97
     if ErrorMsg <> '' then
-      mDebugLn(ErrorMSG)
-    else
+    begin
+      mDebugLn('ERROR IN COMMAND LINE ARGS: ' + ErrorMSG)
+    end else
     begin
       if Application.HasOption('o','open') then
-      begin;
+      begin
+        writeln('Opening file: ' + Application.GetOptionValue('o','open'));
         LoadScriptFile(Application.GetOptionValue('o','open'));
         DoRun:= Application.HasOption('r','run');
+      end else
+      // no valid options
+      begin
+        writeln('No valid command line args are passed');
       end;
     end;
   end;