diff --git a/.gitattributes b/.gitattributes
index 7c1c83fa7c..673aa7bb54 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3761,6 +3761,8 @@ components/pas2js/Pas2JSDsgn.compiled svneol=native#text/plain
 components/pas2js/fpmake.pp svneol=native#text/plain
 components/pas2js/frmpas2jsbrowserprojectoptions.lfm svneol=native#text/plain
 components/pas2js/frmpas2jsbrowserprojectoptions.pp svneol=native#text/plain
+components/pas2js/frmpas2jsnodejsprojectoptions.lfm svneol=native#text/plain
+components/pas2js/frmpas2jsnodejsprojectoptions.pp svneol=native#text/plain
 components/pas2js/languages/pjsdsgnregister.po svneol=native#text/plain
 components/pas2js/languages/pjsdsgnregister.pt_BR.po svneol=native#text/plain
 components/pas2js/languages/pjsdsgnregister.ru.po svneol=native#text/plain
diff --git a/components/pas2js/frmpas2jsbrowserprojectoptions.lfm b/components/pas2js/frmpas2jsbrowserprojectoptions.lfm
index d37e45a5ad..d3a4b48410 100644
--- a/components/pas2js/frmpas2jsbrowserprojectoptions.lfm
+++ b/components/pas2js/frmpas2jsbrowserprojectoptions.lfm
@@ -1,7 +1,7 @@
 object WebBrowserProjectOptionsForm: TWebBrowserProjectOptionsForm
-  Left = 603
+  Left = 952
   Height = 344
-  Top = 213
+  Top = 271
   Width = 426
   Caption = 'Pas2JS Browser project options'
   ClientHeight = 344
diff --git a/components/pas2js/frmpas2jsnodejsprojectoptions.lfm b/components/pas2js/frmpas2jsnodejsprojectoptions.lfm
new file mode 100644
index 0000000000..cf27a0f180
--- /dev/null
+++ b/components/pas2js/frmpas2jsnodejsprojectoptions.lfm
@@ -0,0 +1,8 @@
+object Form2: TForm2
+  Left = 710
+  Height = 240
+  Top = 270
+  Width = 320
+  Caption = 'Form2'
+  LCLVersion = '1.9.0.0'
+end
diff --git a/components/pas2js/frmpas2jsnodejsprojectoptions.pp b/components/pas2js/frmpas2jsnodejsprojectoptions.pp
new file mode 100644
index 0000000000..9345075863
--- /dev/null
+++ b/components/pas2js/frmpas2jsnodejsprojectoptions.pp
@@ -0,0 +1,26 @@
+unit frmpas2jsnodejsprojectoptions;
+
+{$mode objfpc}{$H+}
+
+interface
+
+uses
+  Classes, SysUtils, Forms, Controls, Graphics, Dialogs;
+
+type
+  TForm2 = class(TForm)
+  private
+
+  public
+
+  end;
+
+var
+  Form2: TForm2;
+
+implementation
+
+{$R *.lfm}
+
+end.
+
diff --git a/components/pas2js/pas2jsdsgn.lpk b/components/pas2js/pas2jsdsgn.lpk
index db7597cd5b..ff92f336e5 100644
--- a/components/pas2js/pas2jsdsgn.lpk
+++ b/components/pas2js/pas2jsdsgn.lpk
@@ -18,7 +18,7 @@
     <Description Value="Adds a Lazarus project for pas2js browser applications."/>
     <License Value="GPL-2"/>
     <Version Major="1" Release="1"/>
-    <Files Count="4">
+    <Files Count="5">
       <Item1>
         <Filename Value="pjsdsgnregister.pas"/>
         <HasRegisterProc Value="True"/>
@@ -36,6 +36,10 @@
         <Filename Value="pjsdsgnoptions.pas"/>
         <UnitName Value="PJSDsgnOptions"/>
       </Item4>
+      <Item5>
+        <Filename Value="frmpas2jsnodejsprojectoptions.pp"/>
+        <UnitName Value="frmpas2jsnodejsprojectoptions"/>
+      </Item5>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
diff --git a/components/pas2js/pjsdsgnoptions.pas b/components/pas2js/pjsdsgnoptions.pas
index e9d797ee0d..563b9d3063 100644
--- a/components/pas2js/pjsdsgnoptions.pas
+++ b/components/pas2js/pjsdsgnoptions.pas
@@ -262,176 +262,3 @@ end;
 finalization
   DonePSJOptions;
 end.
-
-(*
-
-
-<<<<<<< .mine
-{ TPas2jsOptions }
-
-procedure TPas2jsOptions.SetModified(AValue: boolean);
-begin
-  if AValue then
-    IncreaseChangeStamp
-  else
-    FSavedStamp:=FChangeStamp;
-end;
-
-function TPas2jsOptions.GetModified: boolean;
-begin
-  Result:=FSavedStamp<>FChangeStamp;
-end;
-
-
-procedure TPas2jsOptions.SetCompilerFilename(AValue: string);
-begin
-  if FCompilerFilename=AValue then Exit;
-  FCompilerFilename:=AValue;
-  IncreaseChangeStamp;
-end;
-
-
-constructor TPas2jsOptions.Create;
-begin
-  FChangeStamp:=LUInvalidChangeStamp64;
-  FCompilerFilename:=PJSDefaultCompiler;
-end;
-
-destructor TPas2jsOptions.Destroy;
-begin
-  inherited Destroy;
-end;
-
-procedure TPas2jsOptions.IncreaseChangeStamp;
-begin
-  LUIncreaseChangeStamp64(FChangeStamp);
-end;
-
-procedure TPas2jsOptions.Load;
-var
-  Cfg: TConfigStorage;
-begin
-  Cfg:=GetIDEConfigStorage(PJSDsgnOptsFile,true);
-  try
-    LoadFromConfig(Cfg);
-  finally
-    Cfg.Free;
-  end;
-end;
-
-procedure TPas2jsOptions.Save;
-var
-  Cfg: TConfigStorage;
-begin
-  Cfg:=GetIDEConfigStorage(PJSDsgnOptsFile,false);
-  try
-    SaveToConfig(Cfg);
-  finally
-    Cfg.Free;
-  end;
-end;
-
-Const
-  KeyCompiler = 'compiler/value';
-  KeyHTTPServer = 'webserver/value';
-  KeyBrowser = 'webbrowser/value';
-  KeyStartPortAt = 'webserver/startatport/value';
-
-procedure TPas2jsOptions.LoadFromConfig(Cfg: TConfigStorage);
-
-begin
-  CompilerFilename:=Cfg.GetValue(KeyCompiler ,PJSDefaultCompiler);
-  HTTPServerFileName:=Cfg.GetValue(KeyHTTPServer,PJSDefaultHTTPServer);
-  BrowserFileName:=Cfg.GetValue(KeyBrowser,PJSDefaultBrowser);
-  StartAtPort :=Cfg.GetValue(KeyStartPortAt,PJSDefaultStartAtPort);
-  Modified:=false;
-end;
-
-procedure TPas2jsOptions.SaveToConfig(Cfg: TConfigStorage);
-
-begin
-  Cfg.SetDeleteValue(KeyCompiler,CompilerFilename,PJSDefaultCompiler);
-  Cfg.SetDeleteValue(KeyHTTPServer,HTTPServerFileName,PJSDefaultHTTPServer);
-  Cfg.SetDeleteValue(KeyStartPortAt,StartAtPort,PJSDefaultStartAtPort);
-  Cfg.SetDeleteValue(KeyBrowser,BrowserFileName,PJSDefaultBrowser);
-  Modified:=false;
-end;
-
-||||||| .r56758
-{ TPas2jsOptions }
-
-procedure TPas2jsOptions.SetModified(AValue: boolean);
-begin
-  if AValue then
-    IncreaseChangeStamp
-  else
-    FSavedStamp:=FChangeStamp;
-end;
-
-function TPas2jsOptions.GetModified: boolean;
-begin
-  Result:=FSavedStamp<>FChangeStamp;
-end;
-
-procedure TPas2jsOptions.SetCompilerFilename(AValue: string);
-begin
-  if FCompilerFilename=AValue then Exit;
-  FCompilerFilename:=AValue;
-  IncreaseChangeStamp;
-end;
-
-constructor TPas2jsOptions.Create;
-begin
-  FChangeStamp:=LUInvalidChangeStamp64;
-  FCompilerFilename:=PJSDefaultCompiler;
-end;
-
-destructor TPas2jsOptions.Destroy;
-begin
-  inherited Destroy;
-end;
-
-procedure TPas2jsOptions.IncreaseChangeStamp;
-begin
-  LUIncreaseChangeStamp64(FChangeStamp);
-end;
-
-procedure TPas2jsOptions.Load;
-var
-  Cfg: TConfigStorage;
-begin
-  Cfg:=GetIDEConfigStorage(PJSDsgnOptsFile,true);
-  try
-    LoadFromConfig(Cfg);
-  finally
-    Cfg.Free;
-  end;
-end;
-
-procedure TPas2jsOptions.Save;
-var
-  Cfg: TConfigStorage;
-begin
-  Cfg:=GetIDEConfigStorage(PJSDsgnOptsFile,false);
-  try
-    SaveToConfig(Cfg);
-  finally
-    Cfg.Free;
-  end;
-end;
-
-procedure TPas2jsOptions.LoadFromConfig(Cfg: TConfigStorage);
-begin
-  CompilerFilename:=Cfg.GetValue('compiler/value',PJSDefaultCompiler);
-  Modified:=false;
-end;
-
-procedure TPas2jsOptions.SaveToConfig(Cfg: TConfigStorage);
-begin
-  Cfg.SetDeleteValue('compiler/value',CompilerFilename,PJSDefaultCompiler);
-end;
-
-=======
->>>>>>> .r56764
-
-*)