diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3539a97..06f4d21 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="d417784f-f8c7-4ee1-8f7a-4b97c99aae62" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/merge_excavator/clone_repositories.py" beforeDir="false" afterPath="$PROJECT_DIR$/merge_excavator/clone_repositories.py" afterDir="false" />
+    <list default="true" id="d417784f-f8c7-4ee1-8f7a-4b97c99aae62" name="Default Changelist" comment="Add Travic-CI status to README.md">
+      <change afterPath="$PROJECT_DIR$/working_dir/repository_lists/samplejava.txt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/merge_excavator/config.py" beforeDir="false" afterPath="$PROJECT_DIR$/merge_excavator/config.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/tests/test_run_time.py" beforeDir="false" afterPath="$PROJECT_DIR$/tests/test_run_time.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/merge_excavator/data_convertion.py" beforeDir="false" afterPath="$PROJECT_DIR$/merge_excavator/data_convertion.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/merge_excavator/merge_replay.py" beforeDir="false" afterPath="$PROJECT_DIR$/merge_excavator/merge_replay.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/merge_excavator/merge_scenario_data.py" beforeDir="false" afterPath="$PROJECT_DIR$/merge_excavator/merge_scenario_data.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/merge_excavator/related_commits.py" beforeDir="false" afterPath="$PROJECT_DIR$/merge_excavator/related_commits.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/merge_excavator/repository_data.py" beforeDir="false" afterPath="$PROJECT_DIR$/merge_excavator/repository_data.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/queries/Merge_Data.sql" beforeDir="false" afterPath="$PROJECT_DIR$/queries/Merge_Data.sql" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/schema/Merge_Data.mwb" beforeDir="false" afterPath="$PROJECT_DIR$/schema/Merge_Data.mwb" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/schema/Merge_Data.png" beforeDir="false" afterPath="$PROJECT_DIR$/schema/Merge_Data.png" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -117,6 +125,43 @@
         </counts>
       </usages-collector>
     </session>
+    <session id="863770518">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.open.time.5" value="1" />
+          <entry key="project.open.time.9" value="1" />
+          <entry key="project.opened" value="2" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="py" value="717" />
+          <entry key="sql" value="21" />
+          <entry key="txt" value="93" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="PLAIN_TEXT" value="93" />
+          <entry key="Python" value="717" />
+          <entry key="SQL" value="21" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.open">
+        <counts>
+          <entry key="py" value="14" />
+          <entry key="sql" value="1" />
+          <entry key="txt" value="1" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.open">
+        <counts>
+          <entry key="PLAIN_TEXT" value="1" />
+          <entry key="Python" value="14" />
+          <entry key="SQL" value="1" />
+        </counts>
+      </usages-collector>
+    </session>
   </component>
   <component name="FavoritesManager">
     <favorites_list name="code-owhadi-msr19" />
@@ -124,12 +169,12 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/merge_excavator/merge_scenario_data.py">
+        <entry file="file://$PROJECT_DIR$/merge_excavator/data_convertion.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="465">
-              <caret line="31" selection-start-line="31" selection-end-line="31" />
+            <state relative-caret-position="330">
+              <caret line="22" column="171" selection-start-line="22" selection-start-column="171" selection-end-line="22" selection-end-column="171" />
               <folding>
-                <element signature="e#1#11#0" expanded="true" />
+                <element signature="e#2#11#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -138,8 +183,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/merge_excavator/repository_data.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
-              <caret line="22" selection-start-line="22" selection-end-line="22" />
+            <state relative-caret-position="480">
+              <caret line="32" column="26" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
               <folding>
                 <element signature="e#1#10#0" expanded="true" />
               </folding>
@@ -148,85 +193,52 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/merge_excavator/main.py">
+        <entry file="file://$PROJECT_DIR$/merge_excavator/merge_replay.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="202">
-              <caret line="14" selection-start-line="14" selection-end-line="14" />
-              <folding>
-                <element signature="e#1#37#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="614">
+              <caret line="157" column="107" selection-start-line="157" selection-start-column="107" selection-end-line="157" selection-end-column="107" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/README.md">
-          <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-            <state split_layout="SPLIT">
-              <first_editor relative-caret-position="195">
-                <caret line="13" column="20" lean-forward="true" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
-              </first_editor>
-              <second_editor />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/merge_excavator/code_quality.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="540">
-              <caret line="36" selection-start-line="36" selection-end-line="36" />
-              <folding>
-                <element signature="e#1#10#0" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/merge_excavator/clone_repositories.py">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="165">
-              <caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/merge_excavator/config.py">
+        <entry file="file://$PROJECT_DIR$/working_dir/repository_lists/samplejava.txt">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="105">
-              <caret line="7" column="44" selection-start-line="7" selection-start-column="44" selection-end-line="7" selection-end-column="44" />
+              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/.travis.yml">
+        <entry file="file://$PROJECT_DIR$/merge_excavator/related_commits.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="35" />
+            <state relative-caret-position="285">
+              <caret line="19" column="37" selection-start-line="19" selection-start-column="37" selection-end-line="19" selection-end-column="37" />
+              <folding>
+                <element signature="e#1#11#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/tests/test_run_time.py">
+        <entry file="file://$PROJECT_DIR$/merge_excavator/merge_scenario_data.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="90">
-              <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
+            <state relative-caret-position="419">
+              <caret line="114" column="58" selection-start-line="114" selection-start-column="58" selection-end-line="114" selection-end-column="58" />
               <folding>
-                <element signature="e#1#10#0" expanded="true" />
+                <element signature="e#1#11#0" expanded="true" />
               </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/setup.sh">
+        <entry file="file://$PROJECT_DIR$/merge_excavator/config.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="300">
-              <caret line="20" selection-start-line="20" selection-end-line="20" />
+            <state relative-caret-position="180">
+              <caret line="12" column="7" selection-start-line="12" selection-end-line="12" selection-end-column="7" />
             </state>
           </provider>
         </entry>
@@ -263,6 +275,7 @@
       <find>exec_conflicting_file</find>
       <find>validat</find>
       <find>valid</find>
+      <find>merge_commit_parent</find>
     </findStrings>
   </component>
   <component name="Git.Settings">
@@ -283,15 +296,11 @@
         <option value="$PROJECT_DIR$/merge excavator/search_repository.py" />
         <option value="$PROJECT_DIR$/setup.py" />
         <option value="$PROJECT_DIR$/merge_excavator/utility.py" />
-        <option value="$PROJECT_DIR$/merge_excavator/related_commits.py" />
         <option value="$PROJECT_DIR$/runAll.sh" />
         <option value="$PROJECT_DIR$/merge_excavator/search_repository.py" />
         <option value="$PROJECT_DIR$/merge_excavator/util.py" />
         <option value="$PROJECT_DIR$/working_dir/repository_lists/sample.txt" />
-        <option value="$PROJECT_DIR$/merge_excavator/data_convertion.py" />
         <option value="$PROJECT_DIR$/merge_excavator/code_quality.py" />
-        <option value="$PROJECT_DIR$/merge_excavator/merge_scenario_data.py" />
-        <option value="$PROJECT_DIR$/merge_excavator/merge_replay.py" />
         <option value="$PROJECT_DIR$/merge_excavator/validation.py" />
         <option value="$PROJECT_DIR$/merge_excavator/GitUtil.py" />
         <option value="$PROJECT_DIR$/merge_excavator/main.py" />
@@ -301,9 +310,15 @@
         <option value="$PROJECT_DIR$/setup.sh" />
         <option value="$PROJECT_DIR$/tests/test_run_time.py" />
         <option value="$PROJECT_DIR$/merge_excavator/clone_repositories.py" />
-        <option value="$PROJECT_DIR$/merge_excavator/config.py" />
-        <option value="$PROJECT_DIR$/merge_excavator/repository_data.py" />
         <option value="$PROJECT_DIR$/README.md" />
+        <option value="$PROJECT_DIR$/merge_excavator/repository_data.py" />
+        <option value="$PROJECT_DIR$/merge_excavator/related_commits.py" />
+        <option value="$PROJECT_DIR$/merge_excavator/config.py" />
+        <option value="$PROJECT_DIR$/queries/Merge_Data.sql" />
+        <option value="$PROJECT_DIR$/merge_excavator/merge_scenario_data.py" />
+        <option value="$PROJECT_DIR$/merge_excavator/data_convertion.py" />
+        <option value="$PROJECT_DIR$/merge_excavator/merge_replay.py" />
+        <option value="$PROJECT_DIR$/working_dir/repository_lists/samplejava.txt" />
       </list>
     </option>
   </component>
@@ -314,9 +329,10 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="1920" />
-    <option name="width" value="1920" />
-    <option name="height" value="1080" />
+    <option name="x" value="67" />
+    <option name="y" value="27" />
+    <option name="width" value="1853" />
+    <option name="height" value="1053" />
   </component>
   <component name="ProjectInspectionProfilesVisibleTreeState">
     <entry key="Project Default">
@@ -338,38 +354,34 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="code-owhadi-msr19" type="b2602c69:ProjectViewProjectNode" />
-              <item name="code-owhadi-msr19" type="462c0819:PsiDirectoryNode" />
+              <item name="Merge-Excavator" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Merge-Excavator" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="code-owhadi-msr19" type="b2602c69:ProjectViewProjectNode" />
-              <item name="code-owhadi-msr19" type="462c0819:PsiDirectoryNode" />
+              <item name="Merge-Excavator" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Merge-Excavator" type="462c0819:PsiDirectoryNode" />
               <item name="merge_excavator" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="code-owhadi-msr19" type="b2602c69:ProjectViewProjectNode" />
-              <item name="code-owhadi-msr19" type="462c0819:PsiDirectoryNode" />
-              <item name="queries" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="code-owhadi-msr19" type="b2602c69:ProjectViewProjectNode" />
-              <item name="code-owhadi-msr19" type="462c0819:PsiDirectoryNode" />
-              <item name="tests" type="462c0819:PsiDirectoryNode" />
+              <item name="Merge-Excavator" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Merge-Excavator" type="462c0819:PsiDirectoryNode" />
+              <item name="working_dir" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="code-owhadi-msr19" type="b2602c69:ProjectViewProjectNode" />
-              <item name="code-owhadi-msr19" type="462c0819:PsiDirectoryNode" />
+              <item name="Merge-Excavator" type="b2602c69:ProjectViewProjectNode" />
+              <item name="Merge-Excavator" type="462c0819:PsiDirectoryNode" />
               <item name="working_dir" type="462c0819:PsiDirectoryNode" />
+              <item name="repository_lists" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -479,27 +491,6 @@
       <option name="presentableId" value="Default" />
       <updated>1534788102940</updated>
     </task>
-    <task id="LOCAL-00027" summary="Refactor the code: combine the Git utility methods into GitUtil class">
-      <created>1535149353028</created>
-      <option name="number" value="00027" />
-      <option name="presentableId" value="LOCAL-00027" />
-      <option name="project" value="LOCAL" />
-      <updated>1535149353028</updated>
-    </task>
-    <task id="LOCAL-00028" summary="Add the working directory">
-      <created>1535389241253</created>
-      <option name="number" value="00028" />
-      <option name="presentableId" value="LOCAL-00028" />
-      <option name="project" value="LOCAL" />
-      <updated>1535389241253</updated>
-    </task>
-    <task id="LOCAL-00029" summary="Add pre-defined values for paths">
-      <created>1535390743784</created>
-      <option name="number" value="00029" />
-      <option name="presentableId" value="LOCAL-00029" />
-      <option name="project" value="LOCAL" />
-      <updated>1535390743784</updated>
-    </task>
     <task id="LOCAL-00030" summary="Add util.py for removing/adding working directories">
       <created>1535390780990</created>
       <option name="number" value="00030" />
@@ -822,7 +813,28 @@
       <option name="project" value="LOCAL" />
       <updated>1535665686846</updated>
     </task>
-    <option name="localTasksCounter" value="76" />
+    <task id="LOCAL-00076" summary="Add temp directories to .gitignore">
+      <created>1535731486901</created>
+      <option name="number" value="00076" />
+      <option name="presentableId" value="LOCAL-00076" />
+      <option name="project" value="LOCAL" />
+      <updated>1535731486902</updated>
+    </task>
+    <task id="LOCAL-00077" summary="Add the run-time test">
+      <created>1535731645377</created>
+      <option name="number" value="00077" />
+      <option name="presentableId" value="LOCAL-00077" />
+      <option name="project" value="LOCAL" />
+      <updated>1535731645377</updated>
+    </task>
+    <task id="LOCAL-00078" summary="Fix naming bud in cloning">
+      <created>1535731674214</created>
+      <option name="number" value="00078" />
+      <option name="presentableId" value="LOCAL-00078" />
+      <option name="project" value="LOCAL" />
+      <updated>1535731674214</updated>
+    </task>
+    <option name="localTasksCounter" value="79" />
     <servers />
   </component>
   <component name="TodoView">
@@ -835,9 +847,10 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="1987" y="27" width="1853" height="1053" extended-state="6" />
+    <frame x="67" y="27" width="1853" height="1053" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.15495296" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49832776" visible="true" weight="0.15827338" />
       <window_info id="Structure" order="1" sideWeight="0.50167227" side_tool="true" weight="0.1284153" />
       <window_info id="Favorites" order="2" sideWeight="0.50167227" side_tool="true" weight="0.1284153" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -885,9 +898,6 @@
       <path value="$PROJECT_DIR$/merge excavator/perwendel___spark" />
       <path value="$PROJECT_DIR$/merge excavator/elasticsearch" />
     </ignored-roots>
-    <MESSAGE value="Fix the logging of main.py" />
-    <MESSAGE value="Fix minor bugs" />
-    <MESSAGE value="Update README.md" />
     <MESSAGE value="Change method name ot address #18" />
     <MESSAGE value="Fix a wording problem to address #12" />
     <MESSAGE value="Fix a wording problem to address #7" />
@@ -910,7 +920,10 @@
     <MESSAGE value="Remove setup.py and use only bash script to install the toolchain" />
     <MESSAGE value="Rename the run-time test" />
     <MESSAGE value="Add Travic-CI status to README.md" />
-    <option name="LAST_COMMIT_MESSAGE" value="Add Travic-CI status to README.md" />
+    <MESSAGE value="Add temp directories to .gitignore" />
+    <MESSAGE value="Add the run-time test" />
+    <MESSAGE value="Fix naming bud in cloning" />
+    <option name="LAST_COMMIT_MESSAGE" value="Fix naming bud in cloning" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -929,13 +942,7 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/setup.cfg">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/setup.cfg" />
     <entry file="file://$PROJECT_DIR$/.gitignore">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="30">
@@ -969,16 +976,6 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/working_dir/repository_lists/sample.txt" />
     <entry file="file://$PROJECT_DIR$/merge_excavator/main_execution.log" />
-    <entry file="file://$PROJECT_DIR$/merge_excavator/related_commits.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
-          <folding>
-            <element signature="e#1#11#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/merge_excavator/validation.py">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="225">
@@ -1000,9 +997,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="345">
           <caret line="23" selection-start-line="23" selection-end-line="23" />
-          <folding>
-            <element signature="e#0#9#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1016,44 +1010,46 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/merge_excavator/merge_replay.py">
+    <entry file="file://$PROJECT_DIR$/schema/Merge_Data.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/tests/test_run-time.py" />
+    <entry file="file://$PROJECT_DIR$/setup.py" />
+    <entry file="file://$PROJECT_DIR$/requirements.txt">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="779">
-          <caret line="85" column="57" selection-start-line="85" selection-start-column="57" selection-end-line="85" selection-end-column="57" />
+        <state relative-caret-position="15">
+          <caret line="1" selection-start-line="1" selection-end-line="1" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/merge_excavator/data_convertion.py">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="22" selection-start-line="22" selection-end-line="22" />
-          <folding>
-            <element signature="e#2#11#0" expanded="true" />
-          </folding>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="255">
+            <caret line="17" column="3" lean-forward="true" selection-start-line="17" selection-start-column="3" selection-end-line="17" selection-end-column="3" />
+          </first_editor>
+          <second_editor />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/schema/Merge_Data.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_run-time.py">
+    <entry file="file://$PROJECT_DIR$/merge_excavator/main.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
+        <state relative-caret-position="202">
+          <caret line="14" selection-start-line="14" selection-end-line="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/setup.py">
+    <entry file="file://$PROJECT_DIR$/.travis.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="225">
-          <caret line="16" column="27" selection-start-line="16" selection-start-column="27" selection-end-line="16" selection-end-column="82" />
+        <state relative-caret-position="135">
+          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="35" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/requirements.txt">
+    <entry file="file://$PROJECT_DIR$/tests/test_run_time.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" selection-start-line="1" selection-end-line="1" />
+        <state relative-caret-position="90">
+          <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
         </state>
       </provider>
     </entry>
@@ -1064,84 +1060,85 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/merge_excavator/main.py">
+    <entry file="file://$PROJECT_DIR$/merge_excavator/clone_repositories.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="202">
-          <caret line="14" selection-start-line="14" selection-end-line="14" />
-          <folding>
-            <element signature="e#1#37#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="165">
+          <caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.travis.yml">
+    <entry file="file://$PROJECT_DIR$/merge_excavator/code_quality.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="4" selection-start-line="9" selection-start-column="4" selection-end-line="9" selection-end-column="35" />
+        <state relative-caret-position="315">
+          <caret line="36" selection-start-line="36" selection-end-line="36" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/merge_excavator/merge_scenario_data.py">
+    <entry file="file://$PROJECT_DIR$/queries/Merge_Data.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="465">
-          <caret line="31" selection-start-line="31" selection-end-line="31" />
-          <folding>
-            <element signature="e#1#11#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="283">
+          <caret line="95" column="30" selection-start-line="95" selection-start-column="30" selection-end-line="95" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/merge_excavator/repository_data.py">
+    <entry file="file://$PROJECT_DIR$/merge_excavator/config.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="22" selection-start-line="22" selection-end-line="22" />
+        <state relative-caret-position="180">
+          <caret line="12" column="7" selection-start-line="12" selection-end-line="12" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/merge_excavator/related_commits.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="19" column="37" selection-start-line="19" selection-start-column="37" selection-end-line="19" selection-end-column="37" />
           <folding>
-            <element signature="e#1#10#0" expanded="true" />
+            <element signature="e#1#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/tests/test_run_time.py">
+    <entry file="file://$PROJECT_DIR$/merge_excavator/merge_scenario_data.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="24" selection-start-line="6" selection-start-column="24" selection-end-line="6" selection-end-column="24" />
+        <state relative-caret-position="419">
+          <caret line="114" column="58" selection-start-line="114" selection-start-column="58" selection-end-line="114" selection-end-column="58" />
           <folding>
-            <element signature="e#1#10#0" expanded="true" />
+            <element signature="e#1#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/merge_excavator/clone_repositories.py">
+    <entry file="file://$PROJECT_DIR$/merge_excavator/repository_data.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="165">
-          <caret line="16" column="23" selection-start-line="16" selection-start-column="23" selection-end-line="16" selection-end-column="23" />
+        <state relative-caret-position="480">
+          <caret line="32" column="26" selection-start-line="32" selection-start-column="26" selection-end-line="32" selection-end-column="26" />
+          <folding>
+            <element signature="e#1#10#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/merge_excavator/code_quality.py">
+    <entry file="file://$PROJECT_DIR$/merge_excavator/data_convertion.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="540">
-          <caret line="36" selection-start-line="36" selection-end-line="36" />
+        <state relative-caret-position="330">
+          <caret line="22" column="171" selection-start-line="22" selection-start-column="171" selection-end-line="22" selection-end-column="171" />
           <folding>
-            <element signature="e#1#10#0" expanded="true" />
+            <element signature="e#2#11#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/merge_excavator/config.py">
+    <entry file="file://$PROJECT_DIR$/merge_excavator/merge_replay.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="105">
-          <caret line="7" column="44" selection-start-line="7" selection-start-column="44" selection-end-line="7" selection-end-column="44" />
+        <state relative-caret-position="614">
+          <caret line="157" column="107" selection-start-line="157" selection-start-column="107" selection-end-line="157" selection-end-column="107" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/README.md">
-      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
-        <state split_layout="SPLIT">
-          <first_editor relative-caret-position="195">
-            <caret line="13" column="20" lean-forward="true" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
-          </first_editor>
-          <second_editor />
+    <entry file="file://$PROJECT_DIR$/working_dir/repository_lists/samplejava.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
         </state>
       </provider>
     </entry>
diff --git a/queries/Merge_Data.sql b/queries/Merge_Data.sql
index 2ba1bb9..ffa8797 100644
--- a/queries/Merge_Data.sql
+++ b/queries/Merge_Data.sql
@@ -1,5 +1,5 @@
 -- MySQL Script generated by MySQL Workbench
--- Thu 30 Aug 2018 02:44:09 PM MDT
+-- Sat 01 Sep 2018 12:04:14 AM MDT
 -- Model: New Model    Version: 1.0
 -- MySQL Workbench Forward Engineering
 
@@ -63,8 +63,7 @@ CREATE TABLE IF NOT EXISTS `Merge_Data`.`Merge_Scenario` (
   `parent2_date` DATETIME NULL,
   `pull_request` INT NULL,
   `Repository_id` BIGINT NOT NULL,
-  PRIMARY KEY (`merge_commit_hash`, `Repository_id`),
-  UNIQUE INDEX `merge_commit_hash_UNIQUE` (`merge_commit_hash` ASC))
+  PRIMARY KEY (`merge_commit_hash`, `Repository_id`))
 ENGINE = InnoDB;
 
 
@@ -82,8 +81,7 @@ CREATE TABLE IF NOT EXISTS `Merge_Data`.`Merge_Replay` (
   `result_is_equal_to_replay` INT NULL,
   `Merge_Scenario_merge_commit_hash` CHAR(40) NOT NULL,
   `Merge_Scenario_Repository_id` BIGINT NOT NULL,
-  PRIMARY KEY (`merge_technique`, `Merge_Scenario_merge_commit_hash`, `Merge_Scenario_Repository_id`),
-  UNIQUE INDEX `merge_technique_UNIQUE` (`merge_technique` ASC))
+  PRIMARY KEY (`merge_technique`, `Merge_Scenario_merge_commit_hash`, `Merge_Scenario_Repository_id`))
 ENGINE = InnoDB;
 
 
@@ -93,27 +91,26 @@ ENGINE = InnoDB;
 DROP TABLE IF EXISTS `Merge_Data`.`Conflicting_File` ;
 
 CREATE TABLE IF NOT EXISTS `Merge_Data`.`Conflicting_File` (
-  `file_path_name` VARCHAR(1000) NOT NULL,
+  `file_path_name` VARCHAR(400) NOT NULL,
   `conflict_type` VARCHAR(40) NULL DEFAULT 0,
   `Merge_Replay_merge_technique` VARCHAR(15) NOT NULL,
   `Merge_Replay_Merge_Scenario_merge_commit_hash` CHAR(40) NOT NULL,
   `Merge_Replay_Merge_Scenario_Repository_id` BIGINT NOT NULL,
-  PRIMARY KEY (`file_path_name`, `Merge_Replay_merge_technique`, `Merge_Replay_Merge_Scenario_merge_commit_hash`, `Merge_Replay_Merge_Scenario_Repository_id`),
-  UNIQUE INDEX `file_path_name_UNIQUE` (`file_path_name` ASC))
+  PRIMARY KEY (`file_path_name`, `Merge_Replay_merge_technique`, `Merge_Replay_Merge_Scenario_merge_commit_hash`, `Merge_Replay_Merge_Scenario_Repository_id`))
 ENGINE = InnoDB;
 
 
 -- -----------------------------------------------------
--- Table `Merge_Data`.`Merge_Related_commit`
+-- Table `Merge_Data`.`Merge_Related_Commit`
 -- -----------------------------------------------------
-DROP TABLE IF EXISTS `Merge_Data`.`Merge_Related_commit` ;
+DROP TABLE IF EXISTS `Merge_Data`.`Merge_Related_Commit` ;
 
-CREATE TABLE IF NOT EXISTS `Merge_Data`.`Merge_Related_commit` (
+CREATE TABLE IF NOT EXISTS `Merge_Data`.`Merge_Related_Commit` (
   `commit_hash` CHAR(40) NOT NULL,
   `date` DATETIME NULL,
   `message` VARCHAR(400) NULL,
   `branch` VARCHAR(45) NULL,
-  `merge_commit_parent` INT NULL DEFAULT '',
+  `merge_commit_parent` INT NULL,
   `file_added_num` INT NULL,
   `file_removed_num` INT NULL,
   `file_renamed_num` INT NULL,
@@ -123,8 +120,7 @@ CREATE TABLE IF NOT EXISTS `Merge_Data`.`Merge_Related_commit` (
   `line_removed_num` INT NULL,
   `Merge_Scenario_merge_commit_hash` CHAR(40) NOT NULL,
   `Merge_Scenario_Repository_id` BIGINT NOT NULL,
-  PRIMARY KEY (`commit_hash`, `Merge_Scenario_merge_commit_hash`, `Merge_Scenario_Repository_id`),
-  UNIQUE INDEX `commit_hash_UNIQUE` (`commit_hash` ASC))
+  PRIMARY KEY (`commit_hash`, `Merge_Scenario_merge_commit_hash`, `Merge_Scenario_Repository_id`))
 ENGINE = InnoDB;
 
 
@@ -134,12 +130,17 @@ ENGINE = InnoDB;
 DROP TABLE IF EXISTS `Merge_Data`.`Code_Complexity` ;
 
 CREATE TABLE IF NOT EXISTS `Merge_Data`.`Code_Complexity` (
-  `commit_hash` CHAR(40) NOT NULL,
-  `measure1_diff` INT NULL,
+  `measure1_diff` FLOAT NULL,
+  `measure2_diff` FLOAT NULL,
+  `measure3_diff` FLOAT NULL,
+  `measure4_diff` FLOAT NULL,
+  `measure5_diff` FLOAT NULL,
+  `measure6_diff` FLOAT NULL,
+  `measure7_diff` FLOAT NULL,
+  `measure8_diff` FLOAT NULL,
   `Merge_Scenario_merge_commit_hash` CHAR(40) NOT NULL,
   `Merge_Scenario_Repository_id` BIGINT NOT NULL,
-  PRIMARY KEY (`commit_hash`, `Merge_Scenario_merge_commit_hash`, `Merge_Scenario_Repository_id`),
-  UNIQUE INDEX `commit_hash_UNIQUE` (`commit_hash` ASC))
+  PRIMARY KEY (`Merge_Scenario_merge_commit_hash`, `Merge_Scenario_Repository_id`))
 ENGINE = InnoDB;
 
 
@@ -149,19 +150,16 @@ ENGINE = InnoDB;
 DROP TABLE IF EXISTS `Merge_Data`.`Conflicting_Region` ;
 
 CREATE TABLE IF NOT EXISTS `Merge_Data`.`Conflicting_Region` (
-  `parent1_path` VARCHAR(1000) NOT NULL,
-  `parent2_path` VARCHAR(1000) NOT NULL,
+  `parent1_path` VARCHAR(400) NOT NULL,
+  `parent2_path` VARCHAR(400) NOT NULL,
   `parent1_start_line` INT NULL,
   `parent1_length` INT NULL,
   `parent2_start_line` INT NULL,
   `parent2_length` INT NULL,
-  `Conflicting_File_file_path_name` VARCHAR(1000) NOT NULL,
-  `Conflicting_File_Merge_Replay_merge_technique` VARCHAR(15) NOT NULL,
-  `Conflicting_File_Merge_Replay_Merge_Scenario_merge_commit_hash` CHAR(40) NOT NULL,
-  `Conflicting_File_Merge_Replay_Merge_Scenario_Repository_id` BIGINT NOT NULL,
-  PRIMARY KEY (`parent1_path`, `parent2_path`, `Conflicting_File_file_path_name`, `Conflicting_File_Merge_Replay_merge_technique`, `Conflicting_File_Merge_Replay_Merge_Scenario_merge_commit_hash`, `Conflicting_File_Merge_Replay_Merge_Scenario_Repository_id`),
-  UNIQUE INDEX `parent1_path_UNIQUE` (`parent1_path` ASC),
-  UNIQUE INDEX `parent2_path_UNIQUE` (`parent2_path` ASC))
+  `Merge_Replay_merge_technique` VARCHAR(15) NOT NULL,
+  `Merge_Replay_Merge_Scenario_merge_commit_hash` CHAR(40) NOT NULL,
+  `Merge_Replay_Merge_Scenario_Repository_id` BIGINT NOT NULL,
+  PRIMARY KEY (`parent1_path`, `parent2_path`, `Merge_Replay_merge_technique`, `Merge_Replay_Merge_Scenario_merge_commit_hash`, `Merge_Replay_Merge_Scenario_Repository_id`))
 ENGINE = InnoDB;
 
 
@@ -177,8 +175,7 @@ CREATE TABLE IF NOT EXISTS `Merge_Data`.`Code_Style_Violation` (
   `parent2_style_violation_num` INT NULL,
   `Merge_Scenario_merge_commit_hash` CHAR(40) NOT NULL,
   `Merge_Scenario_Repository_id` BIGINT NOT NULL,
-  PRIMARY KEY (`merge_commit_style_violation_num`, `Merge_Scenario_merge_commit_hash`, `Merge_Scenario_Repository_id`),
-  UNIQUE INDEX `merge_commit_style_violation_num_UNIQUE` (`merge_commit_style_violation_num` ASC))
+  PRIMARY KEY (`merge_commit_style_violation_num`, `Merge_Scenario_merge_commit_hash`, `Merge_Scenario_Repository_id`))
 ENGINE = InnoDB;
 
 
diff --git a/schema/Merge_Data.mwb b/schema/Merge_Data.mwb
index 0399e91..ae0d5c5 100644
Binary files a/schema/Merge_Data.mwb and b/schema/Merge_Data.mwb differ
diff --git a/schema/Merge_Data.png b/schema/Merge_Data.png
index e198ab5..d5c293f 100644
Binary files a/schema/Merge_Data.png and b/schema/Merge_Data.png differ