diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index dc3a05c..6af99c3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
+<<<<<<< Updated upstream
     <list default="true" id="cf1e275f-fbc1-41d4-a421-0f55447b6367" name="Default" comment="">
       <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Sikofitt/Form/Type/ContactType.php" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
@@ -12,6 +13,9 @@
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Controller/ApiControllerProvider.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Controller/ApiControllerProvider.php" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Sikofitt/Controller/ResumeControllerProvider.php" afterPath="$PROJECT_DIR$/src/Sikofitt/Controller/ResumeControllerProvider.php" />
     </list>
+=======
+    <list default="true" id="cf1e275f-fbc1-41d4-a421-0f55447b6367" name="Default" comment="" />
+>>>>>>> Stashed changes
     <ignored path="resume.iws" />
     <ignored path=".idea/workspace.xml" />
     <ignored path=".idea/dataSources.local.xml" />
@@ -541,17 +545,28 @@
       <workItem from="1467840020930" duration="1614000" />
       <workItem from="1467938148836" duration="1798000" />
       <workItem from="1468092833685" duration="3410000" />
+<<<<<<< Updated upstream
       <workItem from="1468116337948" duration="2641000" />
       <workItem from="1468134888178" duration="420000" />
       <workItem from="1468135339724" duration="10488000" />
+=======
+      <workItem from="1468116337948" duration="3240000" />
+>>>>>>> Stashed changes
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
+<<<<<<< Updated upstream
     <option name="totallyTimeSpent" value="45886000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="122" y="24" width="1701" height="1011" extended-state="0" />
+=======
+    <option name="totallyTimeSpent" value="35577000" />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="110" y="54" width="1701" height="893" extended-state="1" />
+>>>>>>> Stashed changes
     <editor active="true" />
     <layout>
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />