diff --git a/Projects/SAMufasaGUI/testunit.pas b/Projects/SAMufasaGUI/testunit.pas
index 8d70192..e1f37d7 100644
--- a/Projects/SAMufasaGUI/testunit.pas
+++ b/Projects/SAMufasaGUI/testunit.pas
@@ -1418,11 +1418,8 @@ 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));
@@ -1431,14 +1428,9 @@ 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
     begin
       mDebugLn('ERROR IN COMMAND LINE ARGS: ' + ErrorMSG)