diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.form b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.form
index 332d1b3af224..35b928ca64ba 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.form
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.form
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.openapi.diff.impl.external.DiffOptionsForm">
-  <grid id="6e6fb" binding="myPanel" layout-manager="GridLayoutManager" row-count="6" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="2">
+  <grid id="6e6fb" binding="myPanel" layout-manager="GridLayoutManager" row-count="9" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="7" y="76" width="1438" height="296"/>
+      <xy x="7" y="76" width="559" height="314"/>
     </constraints>
     <properties/>
     <border type="none"/>
     <children>
       <component id="4eaba" class="javax.swing.JCheckBox" binding="myEnableFolders">
         <constraints>
-          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <margin top="4" left="2" bottom="0" right="2"/>
@@ -19,147 +19,98 @@
       </component>
       <component id="7ecb6" class="javax.swing.JCheckBox" binding="myEnableFiles">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <margin top="4" left="2" bottom="0" right="2"/>
           <text resource-bundle="messages/DiffBundle" key="diff.options.use.external.tool.for.files.checkbox"/>
         </properties>
       </component>
-      <grid id="9beaf" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="0" vgap="0">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="89fa" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myFoldersTool">
-            <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="3f6a3" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Path to executable:"/>
-            </properties>
-          </component>
-        </children>
-      </grid>
-      <grid id="10020" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="0" vgap="0">
-        <margin top="0" left="0" bottom="0" right="0"/>
-        <constraints>
-          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-        </constraints>
-        <properties/>
-        <border type="none"/>
-        <children>
-          <component id="553c9" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myFilesTool">
-            <constraints>
-              <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value=""/>
-            </properties>
-          </component>
-          <component id="d82e9" class="javax.swing.JLabel">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="Path to executable:"/>
-            </properties>
-          </component>
-        </children>
-      </grid>
       <vspacer id="dba7d">
         <constraints>
-          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="8" column="0" row-span="1" col-span="2" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <grid id="2320a" layout-manager="GridLayoutManager" row-count="4" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="0" left="0" bottom="0" right="0"/>
+      <component id="8a36e" class="javax.swing.JCheckBox" binding="myEnableMerge">
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text resource-bundle="messages/DiffBundle" key="diff.options.use.external.merge.tool.for.files.checkbox"/>
+        </properties>
+      </component>
+      <component id="64be3" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="7" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="&lt;html&gt;Different merge tools have different parameters. It's important to specify all necessary parameters in proper order&lt;br&gt;&#10;&lt;b&gt;%1&lt;/b&gt; - left (Local changes)&lt;br&gt;&#10;&lt;b&gt;%2&lt;/b&gt; - base (Current version without local changes)&lt;br&gt;&#10;&lt;b&gt;%3&lt;/b&gt; - right (Server content)&lt;br&gt;&#10;&lt;b&gt;%4&lt;/b&gt; - output path&lt;/html&gt;"/>
+        </properties>
+      </component>
+      <component id="437e3" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myMergeTool">
+        <constraints>
+          <grid row="5" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value=""/>
+        </properties>
+      </component>
+      <component id="15882" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Path to executable:"/>
+        </properties>
+      </component>
+      <component id="47dec" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="6" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Parameters:"/>
+        </properties>
+      </component>
+      <component id="1c9c8" class="javax.swing.JTextField" binding="myMergeParameters">
+        <constraints>
+          <grid row="6" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
         </constraints>
         <properties/>
-        <clientProperties>
-          <BorderFactoryClass class="java.lang.String" value="com.intellij.ui.IdeBorderFactory"/>
-        </clientProperties>
-        <border type="none"/>
-        <children>
-          <grid id="fc396" binding="myMergePanel" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="0" vgap="0">
-            <margin top="0" left="0" bottom="0" right="0"/>
-            <constraints>
-              <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties/>
-            <border type="none"/>
-            <children>
-              <component id="437e3" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myMergeTool">
-                <constraints>
-                  <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <text value=""/>
-                </properties>
-              </component>
-              <component id="15882" class="javax.swing.JLabel">
-                <constraints>
-                  <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <text value="Path to executable:"/>
-                </properties>
-              </component>
-              <component id="47dec" class="javax.swing.JLabel">
-                <constraints>
-                  <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-                </constraints>
-                <properties>
-                  <horizontalAlignment value="4"/>
-                  <text value="Parameters:"/>
-                </properties>
-              </component>
-              <component id="1c9c8" class="javax.swing.JTextField" binding="myMergeParameters">
-                <constraints>
-                  <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
-                    <preferred-size width="150" height="-1"/>
-                  </grid>
-                </constraints>
-                <properties/>
-              </component>
-            </children>
-          </grid>
-          <vspacer id="4f578">
-            <constraints>
-              <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
-            </constraints>
-          </vspacer>
-          <component id="8a36e" class="javax.swing.JCheckBox" binding="myEnableMerge">
-            <constraints>
-              <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text resource-bundle="messages/DiffBundle" key="diff.options.use.external.merge.tool.for.files.checkbox"/>
-            </properties>
-          </component>
-          <component id="64be3" class="javax.swing.JLabel" binding="myMergeParamInfo">
-            <constraints>
-              <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
-            </constraints>
-            <properties>
-              <text value="&lt;html&gt;Different merge tools have different parameters. It's important to specify all necessary parameters in proper order&lt;br&gt;&#10;&lt;b&gt;%1&lt;/b&gt; - left (Local changes)&lt;br&gt;&#10;&lt;b&gt;%2&lt;/b&gt; - base (Current version without local changes)&lt;br&gt;&#10;&lt;b&gt;%3&lt;/b&gt; - right (Server content)&lt;br&gt;&#10;&lt;b&gt;%4&lt;/b&gt; - output path&lt;/html&gt;"/>
-            </properties>
-          </component>
-        </children>
-      </grid>
+      </component>
+      <component id="553c9" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myFilesTool">
+        <constraints>
+          <grid row="3" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value=""/>
+        </properties>
+      </component>
+      <component id="d82e9" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Path to executable:"/>
+        </properties>
+      </component>
+      <component id="89fa" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myFoldersTool">
+        <constraints>
+          <grid row="1" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="7" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value=""/>
+        </properties>
+      </component>
+      <component id="3f6a3" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Path to executable:"/>
+        </properties>
+      </component>
     </children>
   </grid>
 </form>
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java
index 13946629bdcb..bc65479a1f18 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/DiffOptionsForm.java
@@ -43,8 +43,6 @@ public class DiffOptionsForm implements SearchableConfigurable, Configurable.NoS
   private TextFieldWithBrowseButton myMergeTool;
   private JCheckBox myEnableMerge;
   private JTextField myMergeParameters;
-  private JLabel myMergeParamInfo;
-  private JPanel myMergePanel;
 
   private final ToolPath[] myTools = new ToolPath[3];