diff --git a/Projects/SAMufasaGUI/testunit.pas b/Projects/SAMufasaGUI/testunit.pas
index 8d70192..2caee86 100644
--- a/Projects/SAMufasaGUI/testunit.pas
+++ b/Projects/SAMufasaGUI/testunit.pas
@@ -1418,27 +1418,14 @@ 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
+  if (Paramcount = 1) and not (Application.HasOption('open')) then   // paramcount = 1 means we got only one parameter. We assume this to be a file.  // and try to open it accordingly
   begin
     writeln('Opening file: ' + ParamStr(1));
     if FileExists(ParamStr(1)) then
-    begin
       LoadScriptFile(paramstr(1));
-    end;
-  end else
-<<<<<<< HEAD
+  end else   // we have more parameters. Check for specific options. (-r -o, --run --open)
   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
     begin
       mDebugLn('ERROR IN COMMAND LINE ARGS: ' + ErrorMSG)