diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 96bd043e4..9ec9e685f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -14,6 +14,9 @@
       <change beforePath="$PROJECT_DIR$/src/forge/Main/list.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/forge/Main/list.css.map" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.css.map" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/forge/Main/list.scss" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/list.scss" afterDir="false" />
+<<<<<<< HEAD
+>>>>>>> issue
+=======
 >>>>>>> issue
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -358,6 +361,7 @@
       <workItem from="1630023942152" duration="459000" />
       <workItem from="1630024424307" duration="17223000" />
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
       <workItem from="1630372816729" duration="42897000" />
       <workItem from="1630545632975" duration="297000" />
@@ -368,6 +372,9 @@
 =======
       <workItem from="1630372816729" duration="42897000" />
       <workItem from="1630545632975" duration="297000" />
+>>>>>>> issue
+=======
+      <workItem from="1630372816729" duration="34627000" />
 >>>>>>> issue
     </task>
     <servers />