diff --git a/code.style.schemes.xml b/code.style.schemes.xml
new file mode 100644
index 0000000..700198f
--- /dev/null
+++ b/code.style.schemes.xml
@@ -0,0 +1,5 @@
+<application>
+  <component name="CodeStyleSchemeSettings">
+    <option name="CURRENT_SCHEME_NAME" value="Default (1)" />
+  </component>
+</application>
\ No newline at end of file
diff --git a/diff.xml b/diff.xml
index 9f2ad10..1331e6f 100644
--- a/diff.xml
+++ b/diff.xml
@@ -1,32 +1,35 @@
-<application>
-  <component name="DiffSettings">
-    <option name="PLACES_MAP">
-      <entry key="ChangesView">
-        <PlaceSettings />
-      </entry>
-      <entry key="CommitDialog">
-        <PlaceSettings />
-      </entry>
-      <entry key="Default">
-        <PlaceSettings />
-      </entry>
-    </option>
-  </component>
-  <component name="TextDiffSettings">
-    <option name="PLACES_MAP">
-      <entry key="ChangesView">
-        <PlaceSettings>
-          <option name="EXPAND_BY_DEFAULT" value="false" />
-        </PlaceSettings>
-      </entry>
-      <entry key="CommitDialog">
-        <PlaceSettings>
-          <option name="EXPAND_BY_DEFAULT" value="false" />
-        </PlaceSettings>
-      </entry>
-      <entry key="Default">
-        <PlaceSettings />
-      </entry>
-    </option>
-  </component>
+<application>
+  <component name="DiffSettings">
+    <option name="PLACES_MAP">
+      <entry key="ChangesView">
+        <PlaceSettings />
+      </entry>
+      <entry key="CommitDialog">
+        <PlaceSettings />
+      </entry>
+      <entry key="Default">
+        <PlaceSettings />
+      </entry>
+    </option>
+  </component>
+  <component name="TextDiffSettings">
+    <option name="PLACES_MAP">
+      <entry key="ChangesView">
+        <PlaceSettings>
+          <option name="EXPAND_BY_DEFAULT" value="false" />
+        </PlaceSettings>
+      </entry>
+      <entry key="CommitDialog">
+        <PlaceSettings>
+          <option name="EXPAND_BY_DEFAULT" value="false" />
+        </PlaceSettings>
+      </entry>
+      <entry key="Default">
+        <PlaceSettings />
+      </entry>
+      <entry key="Merge">
+        <PlaceSettings />
+      </entry>
+    </option>
+  </component>
 </application>
\ No newline at end of file
diff --git a/filetypes.xml b/filetypes.xml
index 7735e6d..493c7ae 100644
--- a/filetypes.xml
+++ b/filetypes.xml
@@ -1,8 +1,8 @@
 <application>
   <component name="FileTypeManager" version="16">
     <extensionMap>
-      <mapping pattern="DockerFile" type="Dockerfile" />
       <mapping ext="config" type="PLAIN_TEXT" />
+      <mapping pattern="DockerFile" type="Dockerfile" />
     </extensionMap>
   </component>
 </application>
\ No newline at end of file
diff --git a/other.xml b/other.xml
index 308267b..1d41ddb 100644
--- a/other.xml
+++ b/other.xml
@@ -15,7 +15,56 @@
       </profile-state>
     </entry>
   </component>
+  <component name="CvsApplicationLevelConfiguration">
+    <option name="EXT_CONFIGURATION">
+      <value>
+        <option name="CVS_RSH" value="ssh" />
+        <option name="PRIVATE_KEY_FILE" value="" />
+        <option name="ADDITIONAL_PARAMETERS" value="" />
+        <option name="USE_INTERNAL_SSH_IMPLEMENTATION" value="false" />
+      </value>
+    </option>
+    <option name="SSH_CONFIGURATION">
+      <value SSH_TYPE="SSH1, SSH2">
+        <option name="USE_PPK" value="false" />
+        <option name="PATH_TO_PPK" value="" />
+      </value>
+    </option>
+    <option name="LOCAL_CONFIGURATION">
+      <value>
+        <option name="PATH_TO_CVS_CLIENT" value="cvs" />
+      </value>
+    </option>
+    <option name="PROXY_SETTINGS">
+      <value>
+        <option name="USE_PROXY" value="false" />
+        <option name="PROXY_HOST" value="" />
+        <option name="PROXY_PORT" value="8080" />
+        <option name="TYPE" value="0" />
+        <option name="LOGIN" value="" />
+        <option name="PASSWORD" value="" />
+      </value>
+    </option>
+    <option name="SSH_FOR_EXT_CONFIGURATION">
+      <value SSH_TYPE="SSH1, SSH2">
+        <option name="USE_PPK" value="false" />
+        <option name="PATH_TO_PPK" value="" />
+      </value>
+    </option>
+    <option name="PATH_TO_PASSWORD_FILE" />
+    <option name="TIMEOUT" value="10" />
+    <option name="MAKE_CHECKED_OUT_FILES_READONLY" value="false" />
+    <option name="CHECKOUT_PRUNE_EMPTY_DIRECTORIES" value="true" />
+    <option name="CHECKOUT_KEYWORD_SUBSTITUTION" />
+    <option name="SHOW_RESTORE_DIRECTORIES_CONFIRMATION" value="true" />
+    <option name="ENCODING" value="Default" />
+    <option name="USE_GZIP" value="false" />
+    <option name="DO_OUTPUT" value="false" />
+    <option name="SEND_ENVIRONMENT_VARIABLES_TO_SERVER" value="false" />
+    <option name="SHOW_PATH" value="true" />
+  </component>
   <component name="NodeLocalInterpreterManager">
-    <node-interpreter path="C:/Program Files/nodejs/node.exe" version="5.5.0" last-modified="1453338704000" />
+    <node-interpreter path="C:/Program Files (x86)/nodejs/node.exe" version="5.4.0" last-modified="1452116096000" />
+    <node-interpreter path="C:/Program Files/nodejs/node.exe" version="5.5.0" last-modified="1455371313740" />
   </component>
 </application>
\ No newline at end of file