diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0d780dd4f..96bd043e4 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,17 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
+<<<<<<< HEAD
     <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/public/css/edu-purge.css" beforeDir="false" afterPath="$PROJECT_DIR$/public/css/edu-purge.css" afterDir="false" />
+=======
+    <list default="true" id="9830c5da-176a-4c72-a301-9f6ce98c82fe" name="Default Changelist" comment="色值修改">
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/forge/Main/CoderDepotReadme.jsx" beforeDir="false" afterPath="$PROJECT_DIR$/src/forge/Main/CoderDepotReadme.jsx" afterDir="false" />
+      <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" />
+>>>>>>> issue
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -348,12 +357,17 @@
 =======
       <workItem from="1630023942152" duration="459000" />
       <workItem from="1630024424307" duration="17223000" />
+<<<<<<< HEAD
 <<<<<<< HEAD
       <workItem from="1630372816729" duration="42897000" />
       <workItem from="1630545632975" duration="297000" />
 =======
       <workItem from="1630372816729" duration="34627000" />
 >>>>>>> 3a27fbd47bf8b9e73dad8b02d43bf52d6b5b5e8a
+>>>>>>> issue
+=======
+      <workItem from="1630372816729" duration="42897000" />
+      <workItem from="1630545632975" duration="297000" />
 >>>>>>> issue
     </task>
     <servers />