diff --git a/RedPandaIDE/RedPandaIDE_zh_CN.ts b/RedPandaIDE/RedPandaIDE_zh_CN.ts
index 29a7afb1..b28ef1f7 100644
--- a/RedPandaIDE/RedPandaIDE_zh_CN.ts
+++ b/RedPandaIDE/RedPandaIDE_zh_CN.ts
@@ -3450,18 +3450,18 @@ Are you really want to continue?</oldsource>
     <name>MainWindow</name>
     <message>
         <location filename="mainwindow.ui" line="14"/>
-        <location filename="mainwindow.cpp" line="777"/>
+        <location filename="mainwindow.cpp" line="783"/>
         <source>Red Panda C++</source>
         <translation>小熊猫C++</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="560"/>
         <location filename="mainwindow.ui" line="2628"/>
-        <location filename="mainwindow.cpp" line="4223"/>
-        <location filename="mainwindow.cpp" line="4226"/>
-        <location filename="mainwindow.cpp" line="4230"/>
-        <location filename="mainwindow.cpp" line="4233"/>
-        <location filename="mainwindow.cpp" line="5868"/>
+        <location filename="mainwindow.cpp" line="4250"/>
+        <location filename="mainwindow.cpp" line="4253"/>
+        <location filename="mainwindow.cpp" line="4257"/>
+        <location filename="mainwindow.cpp" line="4260"/>
+        <location filename="mainwindow.cpp" line="5895"/>
         <source>Issues</source>
         <translation>编译器</translation>
     </message>
@@ -3535,7 +3535,7 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="745"/>
-        <location filename="mainwindow.cpp" line="1217"/>
+        <location filename="mainwindow.cpp" line="1223"/>
         <source>Debug Console</source>
         <translation>调试主控台</translation>
     </message>
@@ -3611,7 +3611,7 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">工具栏2</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="172"/>
+        <location filename="mainwindow.cpp" line="173"/>
         <source>New</source>
         <translation>新建</translation>
     </message>
@@ -3669,8 +3669,8 @@ Are you really want to continue?</oldsource>
         <location filename="mainwindow.ui" line="1664"/>
         <location filename="mainwindow.ui" line="1812"/>
         <location filename="mainwindow.ui" line="1815"/>
-        <location filename="mainwindow.cpp" line="1727"/>
-        <location filename="mainwindow.cpp" line="1738"/>
+        <location filename="mainwindow.cpp" line="1733"/>
+        <location filename="mainwindow.cpp" line="1744"/>
         <source>Compile</source>
         <translation>编译</translation>
     </message>
@@ -3732,9 +3732,9 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1883"/>
-        <location filename="mainwindow.cpp" line="2332"/>
-        <location filename="mainwindow.cpp" line="2382"/>
-        <location filename="mainwindow.cpp" line="2797"/>
+        <location filename="mainwindow.cpp" line="2342"/>
+        <location filename="mainwindow.cpp" line="2392"/>
+        <location filename="mainwindow.cpp" line="2807"/>
         <source>Copy</source>
         <translation>复制</translation>
     </message>
@@ -3745,7 +3745,7 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1896"/>
-        <location filename="mainwindow.cpp" line="2340"/>
+        <location filename="mainwindow.cpp" line="2350"/>
         <source>Paste</source>
         <translation>粘贴</translation>
     </message>
@@ -3756,8 +3756,8 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="1904"/>
-        <location filename="mainwindow.cpp" line="2348"/>
-        <location filename="mainwindow.cpp" line="2803"/>
+        <location filename="mainwindow.cpp" line="2358"/>
+        <location filename="mainwindow.cpp" line="2813"/>
         <source>Select All</source>
         <translation>选择全部</translation>
     </message>
@@ -3877,14 +3877,14 @@ Are you really want to continue?</oldsource>
         <location filename="mainwindow.ui" line="307"/>
         <location filename="mainwindow.ui" line="334"/>
         <location filename="mainwindow.ui" line="2620"/>
-        <location filename="mainwindow.cpp" line="655"/>
+        <location filename="mainwindow.cpp" line="656"/>
         <source>Problem Set</source>
         <translation>试题集</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="359"/>
         <location filename="mainwindow.ui" line="362"/>
-        <location filename="mainwindow.cpp" line="6182"/>
+        <location filename="mainwindow.cpp" line="6209"/>
         <source>New Problem Set</source>
         <translation>新建试题集</translation>
     </message>
@@ -3903,14 +3903,14 @@ Are you really want to continue?</oldsource>
     <message>
         <location filename="mainwindow.ui" line="401"/>
         <location filename="mainwindow.ui" line="404"/>
-        <location filename="mainwindow.cpp" line="6225"/>
+        <location filename="mainwindow.cpp" line="6252"/>
         <source>Save Problem Set</source>
         <translation>保存试题集</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="415"/>
         <location filename="mainwindow.ui" line="418"/>
-        <location filename="mainwindow.cpp" line="6249"/>
+        <location filename="mainwindow.cpp" line="6276"/>
         <source>Load Problem Set</source>
         <translation>载入试题集</translation>
     </message>
@@ -3946,7 +3946,7 @@ Are you really want to continue?</oldsource>
         <location filename="mainwindow.ui" line="1139"/>
         <location filename="mainwindow.ui" line="1182"/>
         <location filename="mainwindow.ui" line="2676"/>
-        <location filename="mainwindow.cpp" line="653"/>
+        <location filename="mainwindow.cpp" line="654"/>
         <source>Problem</source>
         <translation>试题</translation>
     </message>
@@ -4249,7 +4249,7 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2306"/>
-        <location filename="mainwindow.cpp" line="5090"/>
+        <location filename="mainwindow.cpp" line="5117"/>
         <source>Clear all breakpoints</source>
         <translation>删除所有断点</translation>
     </message>
@@ -4350,7 +4350,7 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2460"/>
-        <location filename="mainwindow.cpp" line="5809"/>
+        <location filename="mainwindow.cpp" line="5836"/>
         <source>Rename Symbol</source>
         <translation>重命名符号</translation>
     </message>
@@ -4371,13 +4371,13 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2480"/>
-        <location filename="mainwindow.cpp" line="5997"/>
+        <location filename="mainwindow.cpp" line="6024"/>
         <source>Export As RTF</source>
         <translation>导出为RTF</translation>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2485"/>
-        <location filename="mainwindow.cpp" line="6019"/>
+        <location filename="mainwindow.cpp" line="6046"/>
         <source>Export As HTML</source>
         <translation>导出为HTML</translation>
     </message>
@@ -4586,7 +4586,7 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="mainwindow.ui" line="2550"/>
-        <location filename="mainwindow.cpp" line="6161"/>
+        <location filename="mainwindow.cpp" line="6188"/>
         <source>Open Folder</source>
         <translation>打开文件夹</translation>
     </message>
@@ -4596,42 +4596,42 @@ Are you really want to continue?</oldsource>
         <translation>运行参数...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2846"/>
+        <location filename="mainwindow.cpp" line="2856"/>
         <source>File Encoding</source>
         <translation>文件编码</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="194"/>
+        <location filename="mainwindow.cpp" line="195"/>
         <source>Recent Files</source>
         <translation>文件历史</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="788"/>
-        <location filename="mainwindow.cpp" line="790"/>
-        <location filename="mainwindow.cpp" line="820"/>
-        <location filename="mainwindow.cpp" line="822"/>
-        <location filename="mainwindow.cpp" line="849"/>
-        <location filename="mainwindow.cpp" line="851"/>
+        <location filename="mainwindow.cpp" line="794"/>
+        <location filename="mainwindow.cpp" line="796"/>
+        <location filename="mainwindow.cpp" line="826"/>
+        <location filename="mainwindow.cpp" line="828"/>
+        <location filename="mainwindow.cpp" line="855"/>
+        <location filename="mainwindow.cpp" line="857"/>
         <source>Debugging</source>
         <translation>正在调试</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="793"/>
-        <location filename="mainwindow.cpp" line="795"/>
-        <location filename="mainwindow.cpp" line="826"/>
-        <location filename="mainwindow.cpp" line="828"/>
-        <location filename="mainwindow.cpp" line="854"/>
-        <location filename="mainwindow.cpp" line="856"/>
+        <location filename="mainwindow.cpp" line="799"/>
+        <location filename="mainwindow.cpp" line="801"/>
+        <location filename="mainwindow.cpp" line="832"/>
+        <location filename="mainwindow.cpp" line="834"/>
+        <location filename="mainwindow.cpp" line="860"/>
+        <location filename="mainwindow.cpp" line="862"/>
         <source>Running</source>
         <translation>正在运行</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="798"/>
-        <location filename="mainwindow.cpp" line="800"/>
-        <location filename="mainwindow.cpp" line="832"/>
-        <location filename="mainwindow.cpp" line="834"/>
-        <location filename="mainwindow.cpp" line="859"/>
-        <location filename="mainwindow.cpp" line="861"/>
+        <location filename="mainwindow.cpp" line="804"/>
+        <location filename="mainwindow.cpp" line="806"/>
+        <location filename="mainwindow.cpp" line="838"/>
+        <location filename="mainwindow.cpp" line="840"/>
+        <location filename="mainwindow.cpp" line="865"/>
+        <location filename="mainwindow.cpp" line="867"/>
         <source>Compiling</source>
         <translation>正在编译</translation>
     </message>
@@ -4640,194 +4640,194 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">行:%1    列:%2    已选择:%3    总行数:%4    总长度:%5</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="993"/>
+        <location filename="mainwindow.cpp" line="999"/>
         <source>Line:%1 Col:%2 Selected:%3 Lines:%4 Length:%5</source>
         <oldsource>Line: %1 Col: %2 Selected: %3 Lines: %4 Length: %5</oldsource>
         <translation>行: %1 列: %2 已选择 :%3 总行数: %4 总长度: %5</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1011"/>
+        <location filename="mainwindow.cpp" line="1017"/>
         <source>Read Only</source>
         <translation>只读</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1013"/>
+        <location filename="mainwindow.cpp" line="1019"/>
         <source>Insert</source>
         <translation>插入</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1015"/>
+        <location filename="mainwindow.cpp" line="1021"/>
         <source>Overwrite</source>
         <translation>覆写</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1089"/>
+        <location filename="mainwindow.cpp" line="1095"/>
         <source>Close project</source>
         <translation>关闭项目</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1090"/>
+        <location filename="mainwindow.cpp" line="1096"/>
         <source>Are you sure you want to close %1?</source>
         <translation>你确定要关闭&apos;%1&apos;吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1493"/>
-        <location filename="mainwindow.cpp" line="1508"/>
+        <location filename="mainwindow.cpp" line="1499"/>
+        <location filename="mainwindow.cpp" line="1514"/>
         <source>Confirm</source>
         <translation>确认</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1494"/>
-        <location filename="mainwindow.cpp" line="1502"/>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1500"/>
+        <location filename="mainwindow.cpp" line="1508"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>Source file is not compiled.</source>
         <translation>源文件尚未编译。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1495"/>
-        <location filename="mainwindow.cpp" line="1728"/>
+        <location filename="mainwindow.cpp" line="1501"/>
+        <location filename="mainwindow.cpp" line="1734"/>
         <source>Compile now?</source>
         <translation>现在编译？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1509"/>
-        <location filename="mainwindow.cpp" line="1739"/>
+        <location filename="mainwindow.cpp" line="1515"/>
+        <location filename="mainwindow.cpp" line="1745"/>
         <source>Source file is more recent than executable.</source>
         <translation>源文件比可执行程序新。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1510"/>
+        <location filename="mainwindow.cpp" line="1516"/>
         <source>Recompile now?</source>
         <translation>重新编译？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1591"/>
+        <location filename="mainwindow.cpp" line="1597"/>
         <source>No compiler set</source>
         <translation>无编译器设置</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1592"/>
+        <location filename="mainwindow.cpp" line="1598"/>
         <source>No compiler set is configured.</source>
         <translation>没有配置编译器设置。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1592"/>
+        <location filename="mainwindow.cpp" line="1598"/>
         <source>Can&apos;t start debugging.</source>
         <translation>无法启动调试器</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1607"/>
-        <location filename="mainwindow.cpp" line="1697"/>
+        <location filename="mainwindow.cpp" line="1613"/>
+        <location filename="mainwindow.cpp" line="1703"/>
         <source>Enable debugging</source>
         <translation>启用调试参数</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1608"/>
-        <location filename="mainwindow.cpp" line="1698"/>
+        <location filename="mainwindow.cpp" line="1614"/>
+        <location filename="mainwindow.cpp" line="1704"/>
         <source>You have not enabled debugging info (-g3) and/or stripped it from the executable (-s) in Compiler Options.&lt;BR /&gt;&lt;BR /&gt;Do you want to correct this now?</source>
         <translation>当前编译设置中未启用调试选项(-g3)，或启用了信息剥除选项(-s)&lt;br /&gt;&lt;br/&gt;是否纠正这一问题？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1627"/>
+        <location filename="mainwindow.cpp" line="1633"/>
         <source>Project not built</source>
         <translation>项目尚未构建</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1628"/>
+        <location filename="mainwindow.cpp" line="1634"/>
         <source>Project hasn&apos;t been built. Build it now?</source>
         <translation>项目尚未构建。是否构建？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1653"/>
+        <location filename="mainwindow.cpp" line="1659"/>
         <source>Host applcation missing</source>
         <translation>宿主程序不存在</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1654"/>
+        <location filename="mainwindow.cpp" line="1660"/>
         <source>DLL project needs a host application to run.</source>
         <translation>动态链接库（DLL）需要一个宿主程序来运行。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1656"/>
+        <location filename="mainwindow.cpp" line="1662"/>
         <source>But it&apos;s missing.</source>
         <translation>但它不存在。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1661"/>
+        <location filename="mainwindow.cpp" line="1667"/>
         <source>Host application not exists</source>
         <translation>宿主程序不存在</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1662"/>
+        <location filename="mainwindow.cpp" line="1668"/>
         <source>Host application file &apos;%1&apos; doesn&apos;t exist.</source>
         <translation>宿主程序&apos;%1&apos;不存在。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1739"/>
+        <location filename="mainwindow.cpp" line="1745"/>
         <source>Recompile?</source>
         <translation>重新编译？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2026"/>
-        <location filename="mainwindow.cpp" line="2052"/>
+        <location filename="mainwindow.cpp" line="2036"/>
+        <location filename="mainwindow.cpp" line="2062"/>
         <source>Save last open info error</source>
         <translation>保存上次打开信息失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2027"/>
+        <location filename="mainwindow.cpp" line="2037"/>
         <source>Can&apos;t remove old last open information file &apos;%1&apos;</source>
         <translation>无法删除旧上次打开信息文件&apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2053"/>
+        <location filename="mainwindow.cpp" line="2063"/>
         <source>Can&apos;t save last open info file &apos;%1&apos;</source>
         <translation>无法保存上次打开信息文件&apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2068"/>
+        <location filename="mainwindow.cpp" line="2078"/>
         <source>Load last open info error</source>
         <translation>载入上次打开信息失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2069"/>
+        <location filename="mainwindow.cpp" line="2079"/>
         <source>Can&apos;t load last open info file &apos;%1&apos;</source>
         <translation>无法载入上次打开信息文件&apos;%1&apos;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2226"/>
+        <location filename="mainwindow.cpp" line="2236"/>
         <source>Open Source File</source>
         <translation>打开源代码文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2323"/>
+        <location filename="mainwindow.cpp" line="2333"/>
         <source>Show detail debug logs</source>
         <translation>显示详细调试器日志</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2395"/>
+        <location filename="mainwindow.cpp" line="2405"/>
         <source>Copy all</source>
         <translation>全部复制</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2355"/>
-        <location filename="mainwindow.cpp" line="2408"/>
-        <location filename="mainwindow.cpp" line="2792"/>
+        <location filename="mainwindow.cpp" line="2365"/>
+        <location filename="mainwindow.cpp" line="2418"/>
+        <location filename="mainwindow.cpp" line="2802"/>
         <source>Clear</source>
         <translation>清除</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="182"/>
+        <location filename="mainwindow.cpp" line="183"/>
         <source>Export</source>
         <translation>导出</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="200"/>
+        <location filename="mainwindow.cpp" line="201"/>
         <source>Insert Snippet</source>
         <translation>插入代码段</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="273"/>
-        <location filename="mainwindow.cpp" line="6191"/>
+        <location filename="mainwindow.cpp" line="274"/>
+        <location filename="mainwindow.cpp" line="6218"/>
         <source>Problem Set %1</source>
         <translation>试题集%1</translation>
     </message>
@@ -4848,68 +4848,68 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">或者选择使用其他的网络端口。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1560"/>
-        <location filename="mainwindow.cpp" line="1641"/>
+        <location filename="mainwindow.cpp" line="1566"/>
+        <location filename="mainwindow.cpp" line="1647"/>
         <source>Rebuild Project</source>
         <translation>重新构建项目</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1561"/>
-        <location filename="mainwindow.cpp" line="1642"/>
+        <location filename="mainwindow.cpp" line="1567"/>
+        <location filename="mainwindow.cpp" line="1648"/>
         <source>Project has been modified, do you want to rebuild it?</source>
         <translation>项目已经被修改过，是否需要重新构建？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1955"/>
+        <location filename="mainwindow.cpp" line="1965"/>
         <source>Auto Save Error</source>
         <translation>自动保存出错</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="1956"/>
+        <location filename="mainwindow.cpp" line="1966"/>
         <source>Auto save &quot;%1&quot; to &quot;%2&quot; failed:%3</source>
         <translation>自动保存&quot;%1&quot;到&quot;%2&quot;失败：%3</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2202"/>
+        <location filename="mainwindow.cpp" line="2212"/>
         <source>Properties...</source>
         <translation>试题属性...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2251"/>
+        <location filename="mainwindow.cpp" line="2261"/>
         <source>Set Problem Set Name</source>
         <translation>设置试题集名称</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2252"/>
+        <location filename="mainwindow.cpp" line="2262"/>
         <source>Problem Set Name:</source>
         <translation>试题集名称：</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2272"/>
+        <location filename="mainwindow.cpp" line="2282"/>
         <source>Remove</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2290"/>
+        <location filename="mainwindow.cpp" line="2300"/>
         <source>Remove All Bookmarks</source>
         <translation>删除全部书签</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2301"/>
+        <location filename="mainwindow.cpp" line="2311"/>
         <source>Modify Description</source>
         <translation>修改描述</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2309"/>
-        <location filename="mainwindow.cpp" line="6078"/>
-        <location filename="mainwindow.cpp" line="6118"/>
+        <location filename="mainwindow.cpp" line="2319"/>
+        <location filename="mainwindow.cpp" line="6105"/>
+        <location filename="mainwindow.cpp" line="6145"/>
         <source>Bookmark Description</source>
         <translation>书签描述</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2310"/>
-        <location filename="mainwindow.cpp" line="6079"/>
-        <location filename="mainwindow.cpp" line="6119"/>
+        <location filename="mainwindow.cpp" line="2320"/>
+        <location filename="mainwindow.cpp" line="6106"/>
+        <location filename="mainwindow.cpp" line="6146"/>
         <source>Description:</source>
         <translation>描述：</translation>
     </message>
@@ -4918,322 +4918,332 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">在调试主控台中显示调试器输出</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2420"/>
+        <location filename="mainwindow.cpp" line="2430"/>
         <source>Remove this search</source>
         <translation>清除这次搜索</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2430"/>
+        <location filename="mainwindow.cpp" line="2440"/>
         <source>Clear all searches</source>
         <translation>删除所有搜索</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2442"/>
+        <location filename="mainwindow.cpp" line="2452"/>
         <source>Breakpoint condition...</source>
         <translation>断点条件...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2454"/>
+        <location filename="mainwindow.cpp" line="2464"/>
         <source>Break point condition</source>
         <translation>断点条件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2455"/>
+        <location filename="mainwindow.cpp" line="2465"/>
         <source>Enter the condition of the breakpoint:</source>
         <translation>输入当前断点的生效条件:</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2464"/>
+        <location filename="mainwindow.cpp" line="2474"/>
         <source>Remove All Breakpoints</source>
         <oldsource>Remove all breakpoints</oldsource>
         <translation>删除所有断点</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2477"/>
+        <location filename="mainwindow.cpp" line="2487"/>
         <source>Remove Breakpoint</source>
         <translation>删除当前断点</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2500"/>
+        <location filename="mainwindow.cpp" line="2510"/>
         <source>Rename File</source>
         <translation>重命名文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2509"/>
-        <location filename="mainwindow.cpp" line="2528"/>
+        <location filename="mainwindow.cpp" line="2519"/>
+        <location filename="mainwindow.cpp" line="2538"/>
         <source>Add Folder</source>
         <translation>添加文件夹</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2525"/>
+        <location filename="mainwindow.cpp" line="2535"/>
         <source>New folder</source>
         <translation>新文件夹</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2529"/>
+        <location filename="mainwindow.cpp" line="2539"/>
         <source>Folder name:</source>
         <translation>文件夹：</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2543"/>
+        <location filename="mainwindow.cpp" line="2553"/>
         <source>Rename Folder</source>
         <translation>重命名</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2552"/>
+        <location filename="mainwindow.cpp" line="2562"/>
         <source>Remove Folder</source>
         <translation>删除文件夹</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2572"/>
+        <location filename="mainwindow.cpp" line="2582"/>
         <source>Switch to normal view</source>
         <translation>切换为普通视图</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2579"/>
+        <location filename="mainwindow.cpp" line="2589"/>
         <source>Switch to custom view</source>
         <translation>切换为自定义视图</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2591"/>
+        <location filename="mainwindow.cpp" line="2601"/>
         <source>Sort By Type</source>
         <translation>按类型排序</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2596"/>
+        <location filename="mainwindow.cpp" line="2606"/>
         <source>Sort alphabetically</source>
         <translation>按名称排序</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2601"/>
+        <location filename="mainwindow.cpp" line="2611"/>
         <source>Show inherited members</source>
         <translation>显示继承的成员</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2606"/>
+        <location filename="mainwindow.cpp" line="2616"/>
         <source>Goto declaration</source>
         <translation>跳转到声明处</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2609"/>
+        <location filename="mainwindow.cpp" line="2619"/>
         <source>Goto definition</source>
         <translation>跳转到定义处</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2702"/>
-        <location filename="mainwindow.cpp" line="3514"/>
-        <location filename="mainwindow.cpp" line="3518"/>
+        <location filename="mainwindow.cpp" line="2712"/>
+        <location filename="mainwindow.cpp" line="3526"/>
+        <location filename="mainwindow.cpp" line="3530"/>
         <source>New Folder</source>
         <translation>新建文件夹</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2707"/>
-        <location filename="mainwindow.cpp" line="3528"/>
-        <location filename="mainwindow.cpp" line="3534"/>
-        <location filename="mainwindow.cpp" line="5672"/>
+        <location filename="mainwindow.cpp" line="2717"/>
+        <location filename="mainwindow.cpp" line="3540"/>
+        <location filename="mainwindow.cpp" line="3546"/>
+        <location filename="mainwindow.cpp" line="5699"/>
         <source>Delete</source>
         <translation>删除</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2713"/>
+        <location filename="mainwindow.cpp" line="2723"/>
         <source>Open in Editor</source>
         <translation>在编辑器中打开</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2725"/>
+        <location filename="mainwindow.cpp" line="2735"/>
         <source>Open in External Program</source>
         <translation>使用外部程序打开</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2735"/>
+        <location filename="mainwindow.cpp" line="2745"/>
         <source>Open in Terminal</source>
         <translation>在终端中打开</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2751"/>
+        <location filename="mainwindow.cpp" line="2761"/>
         <source>Open in Windows Explorer</source>
         <translation>在Windows浏览器中打开</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2812"/>
+        <location filename="mainwindow.cpp" line="2822"/>
         <source>Character sets</source>
         <translation>字符集</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="2938"/>
+        <location filename="mainwindow.cpp" line="2948"/>
         <source>%1 files autosaved</source>
         <translation>已自动保存%1个文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3225"/>
+        <location filename="mainwindow.cpp" line="3237"/>
         <source>Set answer to...</source>
         <translation>设置答案源代码...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3257"/>
+        <location filename="mainwindow.cpp" line="3269"/>
         <source>select other file...</source>
         <translation>选择其他文件...</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3263"/>
+        <location filename="mainwindow.cpp" line="3275"/>
         <source>Select Answer Source File</source>
         <translation>选择答案源代码文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3265"/>
+        <location filename="mainwindow.cpp" line="3277"/>
         <source>C/C++Source Files (*.c *.cpp *.cc *.cxx)</source>
         <oldsource>C/C++Source Files (*.c *.cpp *.cc *.cxx</oldsource>
         <translation>C/C++源代码文件 (*.c *.cpp *.cc *.cxx)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3529"/>
+        <location filename="mainwindow.cpp" line="3541"/>
         <source>Do you really want to delete %1?</source>
         <translation>你真的要删除%1吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3535"/>
+        <location filename="mainwindow.cpp" line="3547"/>
         <source>Do you really want to delete %1 files?</source>
         <translation>你真的要删除%1个文件吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3738"/>
+        <location filename="mainwindow.cpp" line="3750"/>
         <source>Save project</source>
         <translation>保存项目</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3739"/>
+        <location filename="mainwindow.cpp" line="3751"/>
         <source>The project &apos;%1&apos; has modifications.</source>
         <translation>项目&apos;%1&apos;有改动。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3741"/>
-        <location filename="mainwindow.cpp" line="6185"/>
+        <location filename="mainwindow.cpp" line="3753"/>
+        <location filename="mainwindow.cpp" line="6212"/>
         <source>Do you want to save it?</source>
         <translation>需要保存吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3828"/>
-        <location filename="mainwindow.cpp" line="3839"/>
+        <location filename="mainwindow.cpp" line="3840"/>
+        <location filename="mainwindow.cpp" line="3851"/>
         <source>File Changed</source>
         <translation>文件已发生变化</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3911"/>
+        <location filename="mainwindow.cpp" line="3923"/>
         <source>New Project File?</source>
         <translation>新建项目文件?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3912"/>
+        <location filename="mainwindow.cpp" line="3924"/>
         <source>Do you want to add the new file to the project?</source>
         <translation>您是否要将新建的文件加入项目?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3988"/>
-        <location filename="mainwindow.cpp" line="3998"/>
+        <location filename="mainwindow.cpp" line="4000"/>
         <location filename="mainwindow.cpp" line="4010"/>
-        <location filename="mainwindow.cpp" line="6238"/>
+        <location filename="mainwindow.cpp" line="4022"/>
+        <location filename="mainwindow.cpp" line="6265"/>
         <source>Save Error</source>
         <translation>保存失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4151"/>
+        <location filename="mainwindow.cpp" line="4178"/>
         <source>Change Project Compiler Set</source>
         <translation>改变项目编译器配置集</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4152"/>
+        <location filename="mainwindow.cpp" line="4179"/>
         <source>Change the project&apos;s compiler set will lose all custom compiler set options.</source>
         <translation>改变项目的编译器配置集会导致所有的自定义编译器选项被重置。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4154"/>
+        <location filename="mainwindow.cpp" line="4181"/>
         <source>Do you really want to do that?</source>
         <translation>你真的想要做那些吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5091"/>
+        <location filename="mainwindow.cpp" line="5118"/>
         <source>Do you really want to clear all breakpoints in this file?</source>
         <translation>您真的要清除该文件的所有断点吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5289"/>
+        <location filename="mainwindow.cpp" line="5316"/>
         <source>New project</source>
         <translation>新建项目</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5290"/>
+        <location filename="mainwindow.cpp" line="5317"/>
         <source>Close %1 and start new project?</source>
         <translation>关闭&apos;%1&apos;以打开新项目?</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5303"/>
+        <location filename="mainwindow.cpp" line="5330"/>
         <source>Folder not exist</source>
         <translation>文件夹不存在</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5304"/>
+        <location filename="mainwindow.cpp" line="5331"/>
         <source>Folder &apos;%1&apos; doesn&apos;t exist. Create it now?</source>
         <translation>文件夹&apos;%1&apos;不存在。是否创建？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5311"/>
+        <location filename="mainwindow.cpp" line="5338"/>
         <source>Can&apos;t create folder</source>
         <translation>无法创建文件夹</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5312"/>
+        <location filename="mainwindow.cpp" line="5339"/>
         <source>Failed to create folder &apos;%1&apos;.</source>
         <translation>创建文件夹&apos;%1&apos;失败。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5327"/>
+        <location filename="mainwindow.cpp" line="5354"/>
         <source>Save new project as</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5673"/>
+        <location filename="mainwindow.cpp" line="5700"/>
         <source>Folder %1 is not empty.</source>
         <translation>文件夹%1不是空的。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5674"/>
+        <location filename="mainwindow.cpp" line="5701"/>
         <source>Do you really want to delete it?</source>
         <translation>你真的要删除它吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6531"/>
-        <location filename="mainwindow.cpp" line="6583"/>
+        <location filename="mainwindow.cpp" line="6558"/>
+        <location filename="mainwindow.cpp" line="6610"/>
         <source>Header Exists</source>
         <translation>头文件已存在</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6532"/>
-        <location filename="mainwindow.cpp" line="6584"/>
+        <location filename="mainwindow.cpp" line="6559"/>
+        <location filename="mainwindow.cpp" line="6611"/>
         <source>Header file &quot;%1&quot; already exists!</source>
         <translation>头文件&quot;%1&quot;已存在！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6589"/>
+        <location filename="mainwindow.cpp" line="6616"/>
         <source>Source Exists</source>
         <translation>源文件已存在！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6590"/>
+        <location filename="mainwindow.cpp" line="6617"/>
         <source>Source file &quot;%1&quot; already exists!</source>
         <translation>源文件&quot;%1&quot;已存在！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6733"/>
+        <location filename="mainwindow.cpp" line="6766"/>
+        <source>Can&apos;t commit!</source>
+        <translation>无法提交！</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="6767"/>
+        <source>The following files are in conflicting:</source>
+        <translation>下列文件处于冲突状态，请解决后重新添加和提交：</translation>
+    </message>
+    <message>
+        <location filename="mainwindow.cpp" line="6772"/>
         <source>Commit Message</source>
         <translation>提交信息</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6736"/>
+        <location filename="mainwindow.cpp" line="6775"/>
         <source>Commit Failed</source>
         <translation>提交失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6737"/>
+        <location filename="mainwindow.cpp" line="6776"/>
         <source>Commit message shouldn&apos;t be empty!</source>
         <translation>提交信息不能为空！</translation>
     </message>
@@ -5242,233 +5252,233 @@ Are you really want to continue?</oldsource>
         <translation type="vanished">小熊猫Dev-C++项目文件 (*.dev)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5340"/>
+        <location filename="mainwindow.cpp" line="5367"/>
         <source>New project fail</source>
         <translation>新建项目失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5341"/>
+        <location filename="mainwindow.cpp" line="5368"/>
         <source>Can&apos;t assign project template</source>
         <translation>无法使用模板创建项目</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5434"/>
+        <location filename="mainwindow.cpp" line="5461"/>
         <source>Remove file</source>
         <translation>删除文件</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5435"/>
+        <location filename="mainwindow.cpp" line="5462"/>
         <source>Remove the file from disk?</source>
         <translation>同时从硬盘上删除文件？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5624"/>
+        <location filename="mainwindow.cpp" line="5651"/>
         <source>untitled</source>
         <translation>无标题</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5634"/>
+        <location filename="mainwindow.cpp" line="5661"/>
         <source>New Project File Name</source>
         <translation>新的项目文件名</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5635"/>
+        <location filename="mainwindow.cpp" line="5662"/>
         <source>File Name:</source>
         <translation>文件名：</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5641"/>
+        <location filename="mainwindow.cpp" line="5668"/>
         <source>File Already Exists!</source>
         <translation>文件已存在！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5642"/>
+        <location filename="mainwindow.cpp" line="5669"/>
         <source>File &apos;%1&apos; already exists!</source>
         <translation>文件&apos;%1&apos;已经存在！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5385"/>
+        <location filename="mainwindow.cpp" line="5412"/>
         <source>Add to project</source>
         <translation>添加到项目</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5329"/>
+        <location filename="mainwindow.cpp" line="5356"/>
         <source>Red Panda C++ project file (*.dev)</source>
         <translation>小熊猫C++项目文件(*.dev)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5795"/>
+        <location filename="mainwindow.cpp" line="5822"/>
         <source>Rename Error</source>
         <translation>重命名出错</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5796"/>
+        <location filename="mainwindow.cpp" line="5823"/>
         <source>Symbol &apos;%1&apos; is defined in system header.</source>
         <translation>符号&apos;%1&apos;在系统头文件中定义，无法修改。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5810"/>
+        <location filename="mainwindow.cpp" line="5837"/>
         <source>New Name</source>
         <translation>新名称</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5942"/>
-        <location filename="mainwindow.cpp" line="5952"/>
+        <location filename="mainwindow.cpp" line="5969"/>
+        <location filename="mainwindow.cpp" line="5979"/>
         <source>Replace Error</source>
         <translation>替换出错</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5943"/>
+        <location filename="mainwindow.cpp" line="5970"/>
         <source>Can&apos;t open file &apos;%1&apos; for replace!</source>
         <translation>无法打开文件&apos;%1&apos;进行替换！</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5953"/>
+        <location filename="mainwindow.cpp" line="5980"/>
         <source>Contents has changed since last search!</source>
         <translation>内容和上次查找时不一致。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="5999"/>
+        <location filename="mainwindow.cpp" line="6026"/>
         <source>Rich Text Format Files (*.rtf)</source>
         <translation>RTF格式文件 (*.rtf)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6021"/>
+        <location filename="mainwindow.cpp" line="6048"/>
         <source>HTML Files (*.html)</source>
         <translation>HTML文件 (*.html)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6183"/>
+        <location filename="mainwindow.cpp" line="6210"/>
         <source>The current problem set is not empty.</source>
         <translation>当前的试题集不是空的。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6201"/>
+        <location filename="mainwindow.cpp" line="6228"/>
         <source>Problem %1</source>
         <translation>试题%1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6227"/>
-        <location filename="mainwindow.cpp" line="6251"/>
+        <location filename="mainwindow.cpp" line="6254"/>
+        <location filename="mainwindow.cpp" line="6278"/>
         <source>Problem Set Files (*.pbs)</source>
         <translation>试题集文件 (*.pbs)</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6257"/>
+        <location filename="mainwindow.cpp" line="6284"/>
         <source>Load Error</source>
         <translation>载入失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3417"/>
-        <location filename="mainwindow.cpp" line="6271"/>
+        <location filename="mainwindow.cpp" line="3429"/>
+        <location filename="mainwindow.cpp" line="6298"/>
         <source>Problem Case %1</source>
         <translation>试题案例%1</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="155"/>
-        <location filename="mainwindow.cpp" line="163"/>
-        <location filename="mainwindow.cpp" line="227"/>
-        <location filename="mainwindow.cpp" line="236"/>
-        <location filename="mainwindow.cpp" line="244"/>
-        <location filename="mainwindow.cpp" line="253"/>
-        <location filename="mainwindow.cpp" line="1073"/>
-        <location filename="mainwindow.cpp" line="2190"/>
-        <location filename="mainwindow.cpp" line="2837"/>
-        <location filename="mainwindow.cpp" line="3835"/>
-        <location filename="mainwindow.cpp" line="3946"/>
-        <location filename="mainwindow.cpp" line="4120"/>
-        <location filename="mainwindow.cpp" line="4132"/>
-        <location filename="mainwindow.cpp" line="4538"/>
-        <location filename="mainwindow.cpp" line="4550"/>
+        <location filename="mainwindow.cpp" line="156"/>
+        <location filename="mainwindow.cpp" line="164"/>
+        <location filename="mainwindow.cpp" line="228"/>
+        <location filename="mainwindow.cpp" line="237"/>
+        <location filename="mainwindow.cpp" line="245"/>
+        <location filename="mainwindow.cpp" line="254"/>
+        <location filename="mainwindow.cpp" line="1079"/>
+        <location filename="mainwindow.cpp" line="2200"/>
+        <location filename="mainwindow.cpp" line="2847"/>
+        <location filename="mainwindow.cpp" line="3847"/>
+        <location filename="mainwindow.cpp" line="3958"/>
+        <location filename="mainwindow.cpp" line="4147"/>
+        <location filename="mainwindow.cpp" line="4159"/>
+        <location filename="mainwindow.cpp" line="4565"/>
+        <location filename="mainwindow.cpp" line="4577"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="190"/>
+        <location filename="mainwindow.cpp" line="191"/>
         <source>Recent Projects</source>
         <translation>项目历史</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="607"/>
+        <location filename="mainwindow.cpp" line="608"/>
         <source>Load Theme Error</source>
         <translation>载入主题失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3055"/>
-        <location filename="mainwindow.cpp" line="3181"/>
+        <location filename="mainwindow.cpp" line="3066"/>
+        <location filename="mainwindow.cpp" line="3193"/>
         <source>Version Control</source>
         <translation>版本控制</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3829"/>
+        <location filename="mainwindow.cpp" line="3841"/>
         <source>File &apos;%1&apos; was changed.</source>
         <translation>磁盘文件&apos;%1&apos;已被修改。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3829"/>
+        <location filename="mainwindow.cpp" line="3841"/>
         <source>Reload its content from disk?</source>
         <translation>是否重新读取它的内容？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3840"/>
+        <location filename="mainwindow.cpp" line="3852"/>
         <source>File &apos;%1&apos; was removed.</source>
         <translation>磁盘文件&apos;%1&apos;已被删除。</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3840"/>
+        <location filename="mainwindow.cpp" line="3852"/>
         <source>Keep it open?</source>
         <translation>是否保持它在小熊猫C++中打开的编辑窗口？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="3939"/>
+        <location filename="mainwindow.cpp" line="3951"/>
         <source>Open</source>
         <translation>打开</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4316"/>
+        <location filename="mainwindow.cpp" line="4343"/>
         <source>Compile Failed</source>
         <translation>编译失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4322"/>
+        <location filename="mainwindow.cpp" line="4349"/>
         <source>Run Failed</source>
         <translation>运行失败</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4567"/>
-        <location filename="mainwindow.cpp" line="4581"/>
+        <location filename="mainwindow.cpp" line="4594"/>
+        <location filename="mainwindow.cpp" line="4608"/>
         <source>Confirm Convertion</source>
         <translation>确认转换</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4568"/>
-        <location filename="mainwindow.cpp" line="4582"/>
+        <location filename="mainwindow.cpp" line="4595"/>
+        <location filename="mainwindow.cpp" line="4609"/>
         <source>The editing file will be saved using %1 encoding. &lt;br /&gt;This operation can&apos;t be reverted. &lt;br /&gt;Are you sure to continue?</source>
         <translation>当前编辑器中的文件将会使用%1编码保存。&lt;br /&gt;这项操作无法被撤回。&lt;br /&gt;你确定要继续吗？</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4732"/>
+        <location filename="mainwindow.cpp" line="4759"/>
         <source>New Watch Expression</source>
         <translation>新监视表达式</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4733"/>
+        <location filename="mainwindow.cpp" line="4760"/>
         <source>Enter Watch Expression (it is recommended to use &apos;this-&gt;&apos; for class members):</source>
         <translation>输入监视表达式</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4786"/>
+        <location filename="mainwindow.cpp" line="4813"/>
         <source>Parsing file %1 of %2: &quot;%3&quot;</source>
         <translation>（%1/%2）正在解析文件&quot;%3&quot;</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4808"/>
-        <location filename="mainwindow.cpp" line="4814"/>
+        <location filename="mainwindow.cpp" line="4835"/>
+        <location filename="mainwindow.cpp" line="4841"/>
         <source>Done parsing %1 files in %2 seconds</source>
         <translation>完成%1个文件的解析,用时%2秒</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="4811"/>
+        <location filename="mainwindow.cpp" line="4838"/>
         <source>(%1 files per second)</source>
         <translation>(每秒%1个文件）</translation>
     </message>
@@ -6439,7 +6449,7 @@ Are you really want to continue?</oldsource>
 <context>
     <name>QApplication</name>
     <message>
-        <location filename="main.cpp" line="206"/>
+        <location filename="main.cpp" line="211"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
@@ -6493,23 +6503,23 @@ Are you really want to continue?</oldsource>
     </message>
     <message>
         <location filename="colorscheme.cpp" line="572"/>
-        <location filename="main.cpp" line="91"/>
-        <location filename="main.cpp" line="98"/>
+        <location filename="main.cpp" line="96"/>
+        <location filename="main.cpp" line="103"/>
         <source>Error</source>
         <translation>错误</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="92"/>
+        <location filename="main.cpp" line="97"/>
         <source>Can&apos;t create configuration folder %1</source>
         <translation>无法创建配置文件夹&quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="99"/>
+        <location filename="main.cpp" line="104"/>
         <source>Can&apos;t write to configuration file %1</source>
         <translation>无法写入配置文件夹&quot;%1&quot;</translation>
     </message>
     <message>
-        <location filename="main.cpp" line="157"/>
+        <location filename="main.cpp" line="162"/>
         <source>Can&apos;t load autolink settings</source>
         <translation>无法载入自动链接设置</translation>
     </message>
@@ -7144,7 +7154,7 @@ Are you really want to continue?</oldsource>
         <translation>无法解析试题集文件&quot;%1&quot;:%2</translation>
     </message>
     <message>
-        <location filename="vcs/gitmanager.cpp" line="212"/>
+        <location filename="vcs/gitmanager.cpp" line="223"/>
         <location filename="vcs/gitmergedialog.cpp" line="18"/>
         <source>&lt;Auto Generated by Git&gt;</source>
         <translation>&lt;由Git自动生成&gt;</translation>
@@ -7603,7 +7613,7 @@ Are you really want to continue?</oldsource>
         <translation>自动链接</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6172"/>
+        <location filename="mainwindow.cpp" line="6199"/>
         <location filename="settingsdialog/settingsdialog.cpp" line="170"/>
         <location filename="settingsdialog/settingsdialog.cpp" line="203"/>
         <location filename="settingsdialog/settingsdialog.cpp" line="209"/>
@@ -7679,15 +7689,15 @@ Are you really want to continue?</oldsource>
         <translation>杂项</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6173"/>
-        <location filename="mainwindow.cpp" line="6486"/>
+        <location filename="mainwindow.cpp" line="6200"/>
+        <location filename="mainwindow.cpp" line="6513"/>
         <location filename="settingsdialog/settingsdialog.cpp" line="203"/>
         <location filename="settingsdialog/settingsdialog.cpp" line="206"/>
         <source>Program Runner</source>
         <translation>程序运行</translation>
     </message>
     <message>
-        <location filename="mainwindow.cpp" line="6485"/>
+        <location filename="mainwindow.cpp" line="6512"/>
         <location filename="settingsdialog/settingsdialog.cpp" line="206"/>
         <source>Problem Set</source>
         <translation>试题集</translation>
diff --git a/RedPandaIDE/customfileiconprovider.cpp b/RedPandaIDE/customfileiconprovider.cpp
index 4c827c1d..ae109d6d 100644
--- a/RedPandaIDE/customfileiconprovider.cpp
+++ b/RedPandaIDE/customfileiconprovider.cpp
@@ -43,7 +43,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
     QIcon icon;
     if (info.isDir()) {
         if (mVCSRepository->isFileInRepository(info)) {
-            if (mVCSRepository->isFileStaged(info))
+            if (mVCSRepository->isFileConflicting(info))
+                icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FOLDER_VCS_CONFLICT);
+            else if (mVCSRepository->isFileStaged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FOLDER_VCS_STAGED);
             else if (mVCSRepository->isFileChanged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FOLDER_VCS_CHANGED);
@@ -53,7 +55,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
             icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FOLDER);
     } else if (isHFile(info.fileName())) {
         if (mVCSRepository->isFileInRepository(info)) {
-            if (mVCSRepository->isFileStaged(info))
+            if (mVCSRepository->isFileConflicting(info))
+                icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_HFILE_VCS_CONFLICT);
+            else if (mVCSRepository->isFileStaged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_HFILE_VCS_STAGED);
             else if (mVCSRepository->isFileChanged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_HFILE_VCS_CHANGED);
@@ -63,7 +67,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
             icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_HFILE);
     } else if (isCppFile(info.fileName())) {
         if (mVCSRepository->isFileInRepository(info)) {
-            if (mVCSRepository->isFileStaged(info))
+            if (mVCSRepository->isFileConflicting(info))
+                icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CPPFILE_VCS_CONFLICT);
+            else if (mVCSRepository->isFileStaged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CPPFILE_VCS_STAGED);
             else if (mVCSRepository->isFileChanged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CPPFILE_VCS_CHANGED);
@@ -73,7 +79,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
             icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CPPFILE);
     } else if (isCFile(info.fileName())) {
         if (mVCSRepository->isFileInRepository(info)) {
-            if (mVCSRepository->isFileStaged(info))
+            if (mVCSRepository->isFileConflicting(info))
+                icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CFILE_VCS_CONFLICT);
+            else if (mVCSRepository->isFileStaged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CFILE_VCS_STAGED);
             else if (mVCSRepository->isFileChanged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CFILE_VCS_CHANGED);
@@ -83,7 +91,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
             icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_CFILE);
     } else if (info.suffix()=="dev") {
         if (mVCSRepository->isFileInRepository(info)) {
-            if (mVCSRepository->isFileStaged(info))
+            if (mVCSRepository->isFileConflicting(info))
+                icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_PROJECTFILE_VCS_CONFLICT);
+            else if (mVCSRepository->isFileStaged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_PROJECTFILE_VCS_STAGED);
             else if (mVCSRepository->isFileChanged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_PROJECTFILE_VCS_CHANGED);
@@ -93,7 +103,9 @@ QIcon CustomFileIconProvider::icon(const QFileInfo &info) const
             icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_PROJECTFILE);
     } else {
         if (mVCSRepository->isFileInRepository(info)) {
-            if (mVCSRepository->isFileStaged(info))
+            if (mVCSRepository->isFileConflicting(info))
+                icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FILE_VCS_CONFLICT);
+            else if (mVCSRepository->isFileStaged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FILE_VCS_STAGED);
             else if (mVCSRepository->isFileChanged(info))
                 icon = pIconsManager->getIcon(IconsManager::FILESYSTEM_FILE_VCS_CHANGED);
diff --git a/RedPandaIDE/iconsmanager.cpp b/RedPandaIDE/iconsmanager.cpp
index b4159153..3a1911c7 100644
--- a/RedPandaIDE/iconsmanager.cpp
+++ b/RedPandaIDE/iconsmanager.cpp
@@ -182,26 +182,32 @@ void IconsManager::updateFileSystemIcons(const QString &iconSet, int size)
     mIconPixmaps.insert(FILESYSTEM_GIT, createSVGIcon(iconFolder+"git.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_FOLDER, createSVGIcon(iconFolder+"folder.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_FOLDER_VCS_CHANGED, createSVGIcon(iconFolder+"folder-vcs-changed.svg",size,size));
+    mIconPixmaps.insert(FILESYSTEM_FOLDER_VCS_CONFLICT, createSVGIcon(iconFolder+"folder-vcs-conflict.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_FOLDER_VCS_NOCHANGE, createSVGIcon(iconFolder+"folder-vcs-nochange.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_FOLDER_VCS_STAGED, createSVGIcon(iconFolder+"folder-vcs-staged.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_FILE, createSVGIcon(iconFolder+"file.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_FILE_VCS_CHANGED, createSVGIcon(iconFolder+"file-vcs-changed.svg",size,size));
+    mIconPixmaps.insert(FILESYSTEM_FILE_VCS_CONFLICT, createSVGIcon(iconFolder+"file-vcs-conflict.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_FILE_VCS_NOCHANGE, createSVGIcon(iconFolder+"file-vcs-nochange.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_FILE_VCS_STAGED, createSVGIcon(iconFolder+"file-vcs-staged.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_CFILE, createSVGIcon(iconFolder+"cfile.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_CFILE_VCS_CHANGED, createSVGIcon(iconFolder+"cfile-vcs-changed.svg",size,size));
+    mIconPixmaps.insert(FILESYSTEM_CFILE_VCS_CONFLICT, createSVGIcon(iconFolder+"cfile-vcs-conflict.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_CFILE_VCS_NOCHANGE, createSVGIcon(iconFolder+"cfile-vcs-nochange.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_CFILE_VCS_STAGED, createSVGIcon(iconFolder+"cfile-vcs-staged.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_HFILE, createSVGIcon(iconFolder+"hfile.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_HFILE_VCS_CHANGED, createSVGIcon(iconFolder+"hfile-vcs-changed.svg",size,size));
+    mIconPixmaps.insert(FILESYSTEM_HFILE_VCS_CONFLICT, createSVGIcon(iconFolder+"hfile-vcs-conflict.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_HFILE_VCS_NOCHANGE, createSVGIcon(iconFolder+"hfile-vcs-nochange.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_HFILE_VCS_STAGED, createSVGIcon(iconFolder+"hfile-vcs-staged.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_CPPFILE, createSVGIcon(iconFolder+"cppfile.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_CPPFILE_VCS_CHANGED, createSVGIcon(iconFolder+"cppfile-vcs-changed.svg",size,size));
+    mIconPixmaps.insert(FILESYSTEM_CPPFILE_VCS_CONFLICT, createSVGIcon(iconFolder+"cppfile-vcs-conflict.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_CPPFILE_VCS_NOCHANGE, createSVGIcon(iconFolder+"cppfile-vcs-nochange.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_CPPFILE_VCS_STAGED, createSVGIcon(iconFolder+"cppfile-vcs-staged.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_PROJECTFILE, createSVGIcon(iconFolder+"projectfile.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_PROJECTFILE_VCS_CHANGED, createSVGIcon(iconFolder+"projectfile-vcs-changed.svg",size,size));
+    mIconPixmaps.insert(FILESYSTEM_PROJECTFILE_VCS_CONFLICT, createSVGIcon(iconFolder+"projectfile-vcs-conflict.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_PROJECTFILE_VCS_NOCHANGE, createSVGIcon(iconFolder+"projectfile-vcs-nochange.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_PROJECTFILE_VCS_STAGED, createSVGIcon(iconFolder+"projectfile-vcs-staged.svg",size,size));
     mIconPixmaps.insert(FILESYSTEM_HEADERS_FOLDER, createSVGIcon(iconFolder+"headerfolder.svg",size,size));
diff --git a/RedPandaIDE/iconsmanager.h b/RedPandaIDE/iconsmanager.h
index 703230bd..797983da 100644
--- a/RedPandaIDE/iconsmanager.h
+++ b/RedPandaIDE/iconsmanager.h
@@ -78,6 +78,12 @@ public:
         FILESYSTEM_HFILE_VCS_CHANGED,
         FILESYSTEM_PROJECTFILE_VCS_CHANGED,
         FILESYSTEM_CPPFILE_VCS_CHANGED,
+        FILESYSTEM_FOLDER_VCS_CONFLICT,
+        FILESYSTEM_FILE_VCS_CONFLICT,
+        FILESYSTEM_CFILE_VCS_CONFLICT,
+        FILESYSTEM_HFILE_VCS_CONFLICT,
+        FILESYSTEM_PROJECTFILE_VCS_CONFLICT,
+        FILESYSTEM_CPPFILE_VCS_CONFLICT,
         FILESYSTEM_FOLDER_VCS_NOCHANGE,
         FILESYSTEM_FILE_VCS_NOCHANGE,
         FILESYSTEM_CFILE_VCS_NOCHANGE,
diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp
index 15af830b..913b7b12 100644
--- a/RedPandaIDE/mainwindow.cpp
+++ b/RedPandaIDE/mainwindow.cpp
@@ -43,6 +43,7 @@
 #include "vcs/gitrepository.h"
 #include "vcs/gitbranchdialog.h"
 #include "vcs/gitmergedialog.h"
+#include "widgets/infomessagebox.h"
 
 #include <QCloseEvent>
 #include <QComboBox>
@@ -3061,6 +3062,7 @@ void MainWindow::onProjectViewContextMenu(const QPoint &pos)
     menu.addAction(ui->actionProject_options);
 
     if (pSettings->vcs().gitOk() && hasRepository) {
+        mProject->model()->iconProvider()->update();
         vcsMenu.setTitle(tr("Version Control"));
         if (ui->projectView->selectionModel()->hasSelection()) {
             bool shouldAdd = true;
@@ -3078,7 +3080,11 @@ void MainWindow::onProjectViewContextMenu(const QPoint &pos)
                 PProjectUnit pUnit=mProject->units()[node->unitIndex];
                 if (mProject->model()->iconProvider()->VCSRepository()->isFileInRepository(
                             pUnit->fileName()
-                            )) {
+                            )
+                        &&
+                        !mProject->model()->iconProvider()->VCSRepository()->isFileConflicting(
+                                                    pUnit->fileName()
+                                                    )) {
                     shouldAdd=false;
                     break;
                 }
@@ -3187,13 +3193,18 @@ void MainWindow::onFilesViewContextMenu(const QPoint &pos)
     mFilesView_OpenInExplorer->setEnabled(!path.isEmpty());
 
     if (pSettings->vcs().gitOk() && hasRepository) {
+        mFileSystemModelIconProvider.update();
         vcsMenu.setTitle(tr("Version Control"));
         if (ui->treeFiles->selectionModel()->hasSelection()) {
             bool shouldAdd = true;
             foreach (const QModelIndex& index, ui->treeFiles->selectionModel()->selectedRows()) {
                 if (mFileSystemModelIconProvider.VCSRepository()->isFileInRepository(
                             mFileSystemModel.fileInfo(index)
-                            )) {
+                            ) &&
+                        ! mFileSystemModelIconProvider.VCSRepository()->isFileConflicting(
+                            mFileSystemModel.fileInfo(index)
+                            )
+                        ) {
                     shouldAdd=false;
                     break;
                 }
@@ -5710,16 +5721,16 @@ void MainWindow::updateVCSActions()
     bool shouldEnable = false;
     bool canBranch = false;
     if (ui->projectView->isVisible() && mProject) {
-        GitManager vcsManager;
+        mProject->model()->iconProvider()->update();
         QString branch;
-        hasRepository = vcsManager.hasRepository(mProject->folder(),branch);
+        hasRepository = mProject->model()->iconProvider()->VCSRepository()->hasRepository(branch);
         shouldEnable = true;
         canBranch = !mProject->model()->iconProvider()->VCSRepository()->hasChangedFiles()
                 && !mProject->model()->iconProvider()->VCSRepository()->hasStagedFiles();
     } else if (ui->treeFiles->isVisible()) {
-        GitManager vcsManager;
+        mFileSystemModelIconProvider.update();
         QString branch;
-        hasRepository = vcsManager.hasRepository(pSettings->environment().currentFolder(),branch);
+        hasRepository = mFileSystemModelIconProvider.VCSRepository()->hasRepository(branch);
         shouldEnable = true;
         canBranch =!mFileSystemModelIconProvider.VCSRepository()->hasChangedFiles()
                 && !mFileSystemModelIconProvider.VCSRepository()->hasStagedFiles();
@@ -6754,6 +6765,18 @@ void MainWindow::on_actionGit_Commit_triggered()
     }
     if (folder.isEmpty())
         return;
+
+    GitManager vcsManager;
+    QStringList conflicts = vcsManager.listConflicts(folder);
+    if (!conflicts.isEmpty()) {
+        InfoMessageBox infoBox;
+        infoBox.setMessage(
+                    tr("Can't commit!") + "<br />"
+                    +tr("The following files are in conflicting:")+"<br />"
+                           + linesToText(conflicts));
+        infoBox.exec();
+        return;
+    }
     QString message = QInputDialog::getText(this,tr("Commit Message"),"Commit Message:");
     if (message.isEmpty()) {
         QMessageBox::critical(this,
@@ -6762,7 +6785,6 @@ void MainWindow::on_actionGit_Commit_triggered()
                               );
         return;
     }
-    GitManager vcsManager;
     vcsManager.commit(folder,message,true);
 
     //update project view
diff --git a/RedPandaIDE/resources/iconsets/bluesky/filesystem/cfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/bluesky/filesystem/cfile-vcs-conflict.svg
new file mode 100644
index 00000000..c2b7cb0f
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/bluesky/filesystem/cfile-vcs-conflict.svg
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="cfile-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="2.8934905"
+     inkscape:cx="87.092043"
+     inkscape:cy="132.88449"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1420">
+      <stop
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0"
+         id="stop1416" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop1418" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient1422"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1755"
+       transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
+      <path
+         id="rect848-1"
+         style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
+         transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+         d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+         id="path1641" />
+    </g>
+    <path
+       id="text2970"
+       style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#2c4dff;fill-opacity:1;stroke-width:0.264583"
+       d="m 17.871271,15.28627 c -1.887338,0.06652 -3.603074,1.494063 -3.936045,3.365551 -0.463087,2.059085 0.04847,4.673412 2.097612,5.688699 1.792494,0.883972 3.920067,0.474864 5.615777,-0.439016 0,-0.716797 0,-1.433594 0,-2.150391 -0.618766,-0.132261 -1.068817,0.159596 -1.511718,0.554688 -1.184225,0.780728 -3.207312,0.799329 -3.851563,-0.685547 -0.52169,-1.285789 -0.483042,-3.088664 0.697266,-4.001953 1.247706,-0.776543 2.871086,-0.204218 3.873047,0.726562 0.794598,0.220511 0.900162,-0.248015 0.792968,-0.929297 -0.07567,-0.539614 0.278173,-1.350029 -0.481253,-1.457679 -1.015934,-0.506562 -2.16004,-0.763802 -3.296091,-0.671617 z" />
+    <text
+       xml:space="preserve"
+       style="font-size:28.2223px;line-height:1.25;font-family:sans-serif;stroke-width:0.264583"
+       x="-8.4125614"
+       y="18.471058"
+       id="text2432"><tspan
+         sodipodi:role="line"
+         id="tspan2430"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.264583"
+         x="-8.4125614"
+         y="18.471058" /></text>
+    <g
+       id="g9291">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/bluesky/filesystem/cppfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/bluesky/filesystem/cppfile-vcs-conflict.svg
new file mode 100644
index 00000000..59466849
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/bluesky/filesystem/cppfile-vcs-conflict.svg
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="cppfile-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="8.1840272"
+     inkscape:cx="24.682225"
+     inkscape:cy="83.394151"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1420">
+      <stop
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0"
+         id="stop1416" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop1418" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient1422"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1755"
+       transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
+      <path
+         id="rect848-1"
+         style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
+         transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+         d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+         id="path1641" />
+    </g>
+    <g
+       id="g844"
+       transform="translate(-0.49020728,7.1938e-4)">
+      <path
+         id="text2970"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#2c4dff;fill-opacity:1;stroke-width:0.264583"
+         d="m 14.167102,15.28627 c -1.887338,0.06652 -3.603074,1.494063 -3.936045,3.365551 -0.4630867,2.059085 0.04847,4.673412 2.097612,5.688699 1.792494,0.883972 3.920067,0.474864 5.615777,-0.439016 0,-0.716797 0,-1.433594 0,-2.150391 -0.618766,-0.132261 -1.068817,0.159596 -1.511718,0.554688 -1.184225,0.780728 -3.207312,0.799329 -3.851563,-0.685547 -0.52169,-1.285789 -0.483042,-3.088664 0.697266,-4.001953 1.247706,-0.776543 2.871086,-0.204218 3.873047,0.726562 0.794598,0.220511 0.900162,-0.248015 0.792968,-0.929297 -0.07567,-0.539614 0.278173,-1.350029 -0.481253,-1.457679 -1.015934,-0.506562 -2.16004,-0.763802 -3.296091,-0.671617 z" />
+      <text
+         xml:space="preserve"
+         style="font-size:10.0971px;line-height:1.25;font-family:sans-serif;stroke-width:0.23665"
+         x="18.716648"
+         y="21.428247"
+         id="text11617"
+         transform="scale(0.89442719,1.118034)"><tspan
+           sodipodi:role="line"
+           id="tspan11615"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.0971px;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#3f53ff;fill-opacity:1;stroke-width:0.23665"
+           x="18.716648"
+           y="21.428247">+</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:10.0971px;line-height:1.25;font-family:sans-serif;stroke-width:0.23665"
+         x="24.291918"
+         y="21.393011"
+         id="text11617-3"
+         transform="scale(0.89442719,1.118034)"><tspan
+           sodipodi:role="line"
+           id="tspan11615-1"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.0971px;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#3f53ff;fill-opacity:1;stroke-width:0.23665"
+           x="24.291918"
+           y="21.393011">+</tspan></text>
+    </g>
+    <g
+       id="g9291"
+       transform="translate(-0.18880569,-0.00512481)">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/bluesky/filesystem/file-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/bluesky/filesystem/file-vcs-conflict.svg
new file mode 100644
index 00000000..64acd7b1
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/bluesky/filesystem/file-vcs-conflict.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="file-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="8.1840272"
+     inkscape:cx="47.042854"
+     inkscape:cy="64.699199"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1420">
+      <stop
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0"
+         id="stop1416" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop1418" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient1422"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1755"
+       transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
+      <path
+         id="rect848-1"
+         style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
+         transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+         d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+         id="path1641" />
+    </g>
+    <g
+       id="g9291"
+       transform="translate(-0.05702849,0.02928454)">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/bluesky/filesystem/folder-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/bluesky/filesystem/folder-vcs-conflict.svg
new file mode 100644
index 00000000..85c4f34f
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/bluesky/filesystem/folder-vcs-conflict.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="folder-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="0.5115017"
+     inkscape:cx="-658.84434"
+     inkscape:cy="-333.33222"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g929">
+      <path
+         id="rect934"
+         style="fill:#fcbc4c;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 23.25086,19.940626 0.02129,-5.348279 c -0.02157,-1.176532 -1.20298,-1.844222 -2.462226,-1.92922 l -0.0078,-10.8812511 c 0.06287,-0.93528196 0.02037,-0.88955496 -0.860969,-0.88955496 H 6.4328923 V 21.6662 L 20.623933,21.62608 c 1.6677,-0.09916 2.57977,-0.603319 2.626927,-1.685458 z"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#fdd99b;fill-opacity:1;stroke:#000000;stroke-width:0.200279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 6.4243333,0.89348134 V 21.667422 l 6.1295627,3.630798 c 0.501856,0.355154 0.457316,0.283463 0.458431,-0.602532 l 0.02342,-18.6159783 c 0.04803,-0.8264309 -0.02852,-0.8256775 -0.44161,-1.0993086 z"
+         id="path6014"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+    <g
+       id="g9291"
+       transform="translate(0.06377054,0.06789732)">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/bluesky/filesystem/hfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/bluesky/filesystem/hfile-vcs-conflict.svg
new file mode 100644
index 00000000..c3b19b4e
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/bluesky/filesystem/hfile-vcs-conflict.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="hfile-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="11.573962"
+     inkscape:cx="28.425875"
+     inkscape:cy="69.941476"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1420">
+      <stop
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0"
+         id="stop1416" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop1418" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient1422"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1755"
+       transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
+      <path
+         id="rect848-1"
+         style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
+         transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+         d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+         id="path1641" />
+    </g>
+    <path
+       id="text18521"
+       style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#ff2c2c;fill-opacity:1;stroke-width:0.327221"
+       d="m 13.697559,13.152902 c 0,3.69206 0,7.384117 0,11.076174 0.86394,0 1.72787,0 2.5918,0 0.003,-1.897806 -0.0106,-3.795701 0.0195,-5.693359 0.7188,-0.392097 1.9834,-0.700116 2.36133,0.289062 0.17729,1.785387 0.0606,3.605548 0.0898,5.404297 0.86719,0 1.73437,0 2.60156,0 -0.0652,-2.23573 0.20291,-4.506102 -0.18625,-6.716994 -0.48144,-1.572364 -2.49433,-2.11523 -3.85981,-1.360524 -0.55062,0.282215 -1.28025,0.861239 -1.0262,-0.173263 0,-0.990625 0,-1.981251 0,-2.971877 -0.86394,0 -1.72787,0 -2.5918,0 v 0.1 z" />
+    <g
+       id="g9291"
+       transform="translate(-0.16387349,0.00586638)">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/bluesky/filesystem/projectfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/bluesky/filesystem/projectfile-vcs-conflict.svg
new file mode 100644
index 00000000..cf32579f
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/bluesky/filesystem/projectfile-vcs-conflict.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="projectfile-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="16.368054"
+     inkscape:cx="28.164618"
+     inkscape:cy="85.379726"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient1422"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1420">
+      <stop
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0"
+         id="stop1416" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop1418" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient953"
+       gradientUnits="userSpaceOnUse"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient955"
+       gradientUnits="userSpaceOnUse"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956" />
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g851"
+       transform="translate(0.26700126,-0.33111518)">
+      <g
+         id="g1755"
+         transform="matrix(0.89614957,0,0,0.89614957,5.9992311,-0.90196801)">
+        <path
+           id="rect848-1"
+           style="fill:url(#linearGradient953);stroke:#000000;stroke-width:0.721591"
+           transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+           d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+           id="path1641" />
+      </g>
+      <g
+         id="g1755-7"
+         transform="matrix(0.89614957,0,0,0.89614957,1.8865805,1.8185308)">
+        <path
+           id="rect848-1-2"
+           style="fill:url(#linearGradient955);stroke:#000000;stroke-width:0.721591"
+           transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+           d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+           id="path1641-1" />
+      </g>
+      <g
+         id="g1755-2"
+         transform="matrix(0.89614957,0,0,0.89614957,-2.9140658,3.9216711)">
+        <path
+           id="rect848-1-28"
+           style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
+           transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+           d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+           id="path1641-9" />
+      </g>
+    </g>
+    <g
+       id="g9291"
+       transform="translate(-0.02314843,0.02817845)">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/contrast/filesystem/cfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/contrast/filesystem/cfile-vcs-conflict.svg
new file mode 100644
index 00000000..55d395de
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/contrast/filesystem/cfile-vcs-conflict.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="35"
+   height="35"
+   viewBox="0 0 48 48"
+   fill="none"
+   version="1.1"
+   id="svg18"
+   sodipodi:docname="cfile-vcs-conflict.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs22" />
+  <sodipodi:namedview
+     id="namedview20"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="false"
+     showgrid="false"
+     inkscape:zoom="8.2024385"
+     inkscape:cx="7.3148979"
+     inkscape:cy="3.9622364"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg18" />
+  <rect
+     width="48"
+     height="48"
+     fill="white"
+     fill-opacity="0.01"
+     id="rect2" />
+  <path
+     d="m 19.670936,43.881774 h 8.562887 M 40.803941,26.89076 V 13.881774 l -9,-10.0000006 h -21 c -1.10457,0 -2.000001,0.89543 -2.000001,2 V 26.814545"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path2"
+     sodipodi:nodetypes="cccccssc"
+     style="stroke-width:3.00069;stroke-miterlimit:4;stroke-dasharray:none" />
+  <path
+     id="text2970"
+     style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#bfc9ff;fill-opacity:1;stroke-width:0.411429"
+     d="m 35.594902,29.441142 c -2.934821,0.103439 -5.6028,2.323276 -6.120572,5.233451 -0.720103,3.201889 0.07537,7.267182 3.261799,8.845959 2.787338,1.374581 6.095726,0.738416 8.732564,-0.682672 0,-1.114624 0,-2.229247 0,-3.343871 -0.962184,-0.205666 -1.662016,0.248173 -2.35073,0.862543 -1.841476,1.214037 -4.987388,1.242961 -5.989202,-1.066029 -0.811231,-1.999409 -0.751133,-4.80289 1.084253,-6.22306 1.94019,-1.207528 4.464555,-0.31756 6.02261,1.129808 1.235604,0.342896 1.399757,-0.385664 1.233069,-1.445061 -0.117667,-0.839103 0.432561,-2.099303 -0.748351,-2.2667 -1.579783,-0.787706 -3.358874,-1.187716 -5.12544,-1.044368 z" />
+  <path
+     d="M 30.803941,3.8817734 V 13.881774 h 10"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path8" />
+  <text
+     xml:space="preserve"
+     style="font-size:146.286px;line-height:1.25;font-family:sans-serif;stroke-width:1.37143"
+     x="15.724138"
+     y="20.571428"
+     id="text3217"><tspan
+       sodipodi:role="line"
+       id="tspan3215"
+       style="stroke-width:1.37143"
+       x="15.724138"
+       y="20.571428">!</tspan></text>
+  <g
+     id="g1154">
+    <text
+       xml:space="preserve"
+       style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
+       x="8.2130604"
+       y="45.614185"
+       id="text7085"
+       transform="scale(1.0690363,0.93542194)"><tspan
+         sodipodi:role="line"
+         id="tspan7083"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
+         x="8.2130604"
+         y="45.614185">!</tspan></text>
+    <path
+       sodipodi:type="star"
+       style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8328"
+       inkscape:flatsided="true"
+       sodipodi:sides="3"
+       sodipodi:cx="22.118614"
+       sodipodi:cy="41.472401"
+       sodipodi:r1="20.71603"
+       sodipodi:r2="10.358015"
+       sodipodi:arg1="-0.48603193"
+       sodipodi:arg2="0.56116562"
+       inkscape:rounded="0.1"
+       inkscape:randomized="0"
+       transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
+       inkscape:transform-center-x="0.12750331"
+       inkscape:transform-center-y="1.585798"
+       d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/contrast/filesystem/cppfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/contrast/filesystem/cppfile-vcs-conflict.svg
new file mode 100644
index 00000000..05f30bde
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/contrast/filesystem/cppfile-vcs-conflict.svg
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="35"
+   height="35"
+   viewBox="0 0 48 48"
+   fill="none"
+   version="1.1"
+   id="svg18"
+   sodipodi:docname="cppfile-vcs-conflict.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs22" />
+  <sodipodi:namedview
+     id="namedview20"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="false"
+     showgrid="false"
+     inkscape:zoom="32.809754"
+     inkscape:cx="13.989742"
+     inkscape:cy="21.838018"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg18" />
+  <rect
+     width="48"
+     height="48"
+     fill="white"
+     fill-opacity="0.01"
+     id="rect2" />
+  <path
+     d="m 19.670936,43.881774 h 5.051736 M 40.803941,26.054772 V 13.881774 l -9,-10.0000006 h -21 c -1.10457,0 -2.000001,0.89543 -2.000001,2 V 26.981743"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path2"
+     sodipodi:nodetypes="cccccssc" />
+  <path
+     d="M 30.803941,3.8817734 V 13.881774 h 10"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path8" />
+  <text
+     xml:space="preserve"
+     style="font-size:146.286px;line-height:1.25;font-family:sans-serif;stroke-width:1.37143"
+     x="15.724138"
+     y="20.571428"
+     id="text3217"><tspan
+       sodipodi:role="line"
+       id="tspan3215"
+       style="stroke-width:1.37143"
+       x="15.724138"
+       y="20.571428">!</tspan></text>
+  <g
+     id="g17075"
+     style="fill:#bfffc6;fill-opacity:1"
+     transform="translate(0.10411712,0.09389895)">
+    <path
+       id="text2970"
+       style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#bfffc6;fill-opacity:1;stroke-width:0.411429"
+       d="m 32.14033,29.479612 c -2.934821,0.103439 -5.6028,2.323276 -6.120572,5.233451 -0.720103,3.201889 0.07537,7.267182 3.261799,8.845959 2.787338,1.374581 6.095726,0.738416 8.732564,-0.682672 0,-1.114624 0,-2.229247 0,-3.343871 -0.962184,-0.205666 -1.662016,0.248173 -2.35073,0.862543 -1.841476,1.214037 -4.987388,1.242961 -5.989202,-1.066029 -0.811231,-1.999409 -0.751133,-4.80289 1.084253,-6.22306 1.94019,-1.207528 4.464555,-0.31756 6.02261,1.129808 1.235604,0.342896 1.399757,-0.385664 1.233069,-1.445061 -0.117667,-0.839103 0.432561,-2.099303 -0.748351,-2.2667 -1.579783,-0.787706 -3.358874,-1.187716 -5.12544,-1.044368 z" />
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:14.738px;line-height:1.25;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#bfffc6;fill-opacity:1;stroke-width:0.460564"
+       x="43.51461"
+       y="35.595913"
+       id="text10817"
+       transform="scale(0.83956824,1.1910884)"><tspan
+         sodipodi:role="line"
+         id="tspan10815"
+         style="fill:#bfffc6;fill-opacity:1;stroke-width:0.460564"
+         x="43.51461"
+         y="35.595913">+</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-weight:bold;font-size:14.738px;line-height:1.25;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#bfffc6;fill-opacity:1;stroke-width:0.460564"
+       x="47.708836"
+       y="29.637804"
+       id="text10817-3"
+       transform="scale(0.83956824,1.1910884)"><tspan
+         sodipodi:role="line"
+         id="tspan10815-6"
+         style="fill:#bfffc6;fill-opacity:1;stroke-width:0.460564"
+         x="47.708836"
+         y="29.637804">+</tspan></text>
+  </g>
+  <g
+     id="g1154"
+     transform="translate(-0.41634808,0.02281776)">
+    <text
+       xml:space="preserve"
+       style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
+       x="8.2130604"
+       y="45.614185"
+       id="text7085"
+       transform="scale(1.0690363,0.93542194)"><tspan
+         sodipodi:role="line"
+         id="tspan7083"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
+         x="8.2130604"
+         y="45.614185">!</tspan></text>
+    <path
+       sodipodi:type="star"
+       style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8328"
+       inkscape:flatsided="true"
+       sodipodi:sides="3"
+       sodipodi:cx="22.118614"
+       sodipodi:cy="41.472401"
+       sodipodi:r1="20.71603"
+       sodipodi:r2="10.358015"
+       sodipodi:arg1="-0.48603193"
+       sodipodi:arg2="0.56116562"
+       inkscape:rounded="0.1"
+       inkscape:randomized="0"
+       transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
+       inkscape:transform-center-x="0.12750331"
+       inkscape:transform-center-y="1.585798"
+       d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/contrast/filesystem/file-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/contrast/filesystem/file-vcs-conflict.svg
new file mode 100644
index 00000000..ec3f8626
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/contrast/filesystem/file-vcs-conflict.svg
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="35"
+   height="35"
+   viewBox="0 0 48 48"
+   fill="none"
+   version="1.1"
+   id="svg18"
+   sodipodi:docname="file-vcs-conflict.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs22" />
+  <sodipodi:namedview
+     id="namedview20"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="false"
+     showgrid="false"
+     inkscape:zoom="11.6"
+     inkscape:cx="29.482759"
+     inkscape:cy="22.887931"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg18" />
+  <rect
+     width="48"
+     height="48"
+     fill="white"
+     fill-opacity="0.01"
+     id="rect2" />
+  <path
+     d="m 19.670936,43.881774 h 19.133005 c 1.1046,0 2,-0.8954 2,-2 v -28 l -9,-10.0000006 h -21 c -1.10457,0 -2.000001,0.89543 -2.000001,2 V 27.221676"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path2"
+     sodipodi:nodetypes="cssccssc" />
+  <path
+     d="M 30.803941,3.8817734 V 13.881774 h 10"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path8" />
+  <text
+     xml:space="preserve"
+     style="font-size:146.286px;line-height:1.25;font-family:sans-serif;stroke-width:1.37143"
+     x="15.724138"
+     y="20.571428"
+     id="text3217"><tspan
+       sodipodi:role="line"
+       id="tspan3215"
+       style="stroke-width:1.37143"
+       x="15.724138"
+       y="20.571428">!</tspan></text>
+  <g
+     id="g1154"
+     transform="translate(-0.20132715,-0.17647077)">
+    <text
+       xml:space="preserve"
+       style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
+       x="8.2130604"
+       y="45.614185"
+       id="text7085"
+       transform="scale(1.0690363,0.93542194)"><tspan
+         sodipodi:role="line"
+         id="tspan7083"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
+         x="8.2130604"
+         y="45.614185">!</tspan></text>
+    <path
+       sodipodi:type="star"
+       style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8328"
+       inkscape:flatsided="true"
+       sodipodi:sides="3"
+       sodipodi:cx="22.118614"
+       sodipodi:cy="41.472401"
+       sodipodi:r1="20.71603"
+       sodipodi:r2="10.358015"
+       sodipodi:arg1="-0.48603193"
+       sodipodi:arg2="0.56116562"
+       inkscape:rounded="0.1"
+       inkscape:randomized="0"
+       transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
+       inkscape:transform-center-x="0.12750331"
+       inkscape:transform-center-y="1.585798"
+       d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/contrast/filesystem/folder-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/contrast/filesystem/folder-vcs-conflict.svg
new file mode 100644
index 00000000..69f37686
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/contrast/filesystem/folder-vcs-conflict.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="35"
+   height="35"
+   viewBox="0 0 48 48"
+   fill="none"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="folder-vcs-conflict.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     id="namedview10"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="false"
+     showgrid="false"
+     inkscape:zoom="11.6"
+     inkscape:cx="18.189655"
+     inkscape:cy="23.405172"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <path
+     d="M 5,33.438424 5,8 C 5,6.89543 5.89543,6 7,6 h 12 l 5,6 h 17 c 1.1046,0 2,0.8954 2,2 v 26 c 0,1.1046 -0.8954,2 -2,2 H 19.827586"
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linejoin="round"
+     id="path2"
+     sodipodi:nodetypes="cssccssssc" />
+  <g
+     id="g1154"
+     transform="translate(0.50803204,-1.9498697)">
+    <text
+       xml:space="preserve"
+       style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
+       x="8.2130604"
+       y="45.614185"
+       id="text7085"
+       transform="scale(1.0690363,0.93542194)"><tspan
+         sodipodi:role="line"
+         id="tspan7083"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
+         x="8.2130604"
+         y="45.614185">!</tspan></text>
+    <path
+       sodipodi:type="star"
+       style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8328"
+       inkscape:flatsided="true"
+       sodipodi:sides="3"
+       sodipodi:cx="22.118614"
+       sodipodi:cy="41.472401"
+       sodipodi:r1="20.71603"
+       sodipodi:r2="10.358015"
+       sodipodi:arg1="-0.48603193"
+       sodipodi:arg2="0.56116562"
+       inkscape:rounded="0.1"
+       inkscape:randomized="0"
+       transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
+       inkscape:transform-center-x="0.12750331"
+       inkscape:transform-center-y="1.585798"
+       d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/contrast/filesystem/hfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/contrast/filesystem/hfile-vcs-conflict.svg
new file mode 100644
index 00000000..f3c3368a
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/contrast/filesystem/hfile-vcs-conflict.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="35"
+   height="35"
+   viewBox="0 0 48 48"
+   fill="none"
+   version="1.1"
+   id="svg18"
+   sodipodi:docname="hfile-vcs-conflict.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs22" />
+  <sodipodi:namedview
+     id="namedview20"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="false"
+     showgrid="false"
+     inkscape:zoom="11.6"
+     inkscape:cx="-4.9137932"
+     inkscape:cy="36.336208"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg18" />
+  <rect
+     width="48"
+     height="48"
+     fill="white"
+     fill-opacity="0.01"
+     id="rect2" />
+  <path
+     d="m 19.670936,43.881774 h 6.431117 M 40.803941,26.89076 V 13.881774 l -9,-10.0000006 h -21 c -1.10457,0 -2.000001,0.89543 -2.000001,2 V 27.339903"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path2"
+     sodipodi:nodetypes="cccccssc" />
+  <path
+     d="M 30.803941,3.8817734 V 13.881774 h 10"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path8" />
+  <text
+     xml:space="preserve"
+     style="font-size:146.286px;line-height:1.25;font-family:sans-serif;stroke-width:1.37143"
+     x="15.724138"
+     y="20.571428"
+     id="text3217"><tspan
+       sodipodi:role="line"
+       id="tspan3215"
+       style="stroke-width:1.37143"
+       x="15.724138"
+       y="20.571428">!</tspan></text>
+  <path
+     id="text18521"
+     style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#ffa8a8;fill-opacity:1;stroke-width:0.50883"
+     d="m 29.061409,26.658264 c 0,5.741171 0,11.482341 0,17.22351 1.343419,0 2.686838,0 4.030259,0 0.0044,-2.951099 -0.01653,-5.902336 0.03037,-8.853205 1.117735,-0.609713 3.0842,-1.088685 3.671878,0.449493 0.275694,2.776287 0.09428,5.606647 0.139702,8.403712 1.348481,0 2.696963,0 4.045444,0 -0.101449,-3.476572 0.315519,-7.007014 -0.289616,-10.444963 -0.748641,-2.445035 -3.878708,-3.289195 -6.002038,-2.115623 -0.856205,0.438846 -1.990791,1.339232 -1.595747,-0.269425 0,-1.540427 0,-3.080855 0,-4.621282 -1.343421,0 -2.68684,0 -4.030259,0 v 0.1555 z" />
+  <g
+     id="g1154"
+     transform="translate(-0.20132695,-0.29469724)">
+    <text
+       xml:space="preserve"
+       style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
+       x="8.2130604"
+       y="45.614185"
+       id="text7085"
+       transform="scale(1.0690363,0.93542194)"><tspan
+         sodipodi:role="line"
+         id="tspan7083"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
+         x="8.2130604"
+         y="45.614185">!</tspan></text>
+    <path
+       sodipodi:type="star"
+       style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8328"
+       inkscape:flatsided="true"
+       sodipodi:sides="3"
+       sodipodi:cx="22.118614"
+       sodipodi:cy="41.472401"
+       sodipodi:r1="20.71603"
+       sodipodi:r2="10.358015"
+       sodipodi:arg1="-0.48603193"
+       sodipodi:arg2="0.56116562"
+       inkscape:rounded="0.1"
+       inkscape:randomized="0"
+       transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
+       inkscape:transform-center-x="0.12750331"
+       inkscape:transform-center-y="1.585798"
+       d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/contrast/filesystem/projectfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/contrast/filesystem/projectfile-vcs-conflict.svg
new file mode 100644
index 00000000..a5f09fd1
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/contrast/filesystem/projectfile-vcs-conflict.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="35"
+   height="35"
+   viewBox="0 0 48 48"
+   fill="none"
+   version="1.1"
+   id="svg18"
+   sodipodi:docname="projectfile-vcs-conflict.svg"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs22" />
+  <sodipodi:namedview
+     id="namedview20"
+     pagecolor="#000000"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="5.8"
+     inkscape:cx="-39.137931"
+     inkscape:cy="8.362069"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg18" />
+  <rect
+     width="48"
+     height="48"
+     fill="white"
+     fill-opacity="0.01"
+     id="rect2" />
+  <g
+     id="g1154"
+     transform="translate(1.2173921,-4.6690815)">
+    <text
+       xml:space="preserve"
+       style="font-size:20.813px;line-height:1.25;font-family:sans-serif;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406"
+       x="8.2130604"
+       y="45.614185"
+       id="text7085"
+       transform="scale(1.0690363,0.93542194)"><tspan
+         sodipodi:role="line"
+         id="tspan7083"
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.650406;stroke-opacity:1"
+         x="8.2130604"
+         y="45.614185">!</tspan></text>
+    <path
+       sodipodi:type="star"
+       style="fill:none;fill-opacity:0.75;stroke:#ffffff;stroke-width:4.85737;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path8328"
+       inkscape:flatsided="true"
+       sodipodi:sides="3"
+       sodipodi:cx="22.118614"
+       sodipodi:cy="41.472401"
+       sodipodi:r1="20.71603"
+       sodipodi:r2="10.358015"
+       sodipodi:arg1="-0.48603193"
+       sodipodi:arg2="0.56116562"
+       inkscape:rounded="0.1"
+       inkscape:randomized="0"
+       transform="matrix(0.61775998,0,0,-0.61775998,-0.68116884,62.17597)"
+       inkscape:transform-center-x="0.12750331"
+       inkscape:transform-center-y="1.585798"
+       d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+  </g>
+  <path
+     d="m 14,12 v 7.172414 M 18.9259,39.7046 C 21.5884,40.5096 25.1224,41 29,41 c 8.2843,0 15,-2.2386 15,-5 v -8 -8 -8"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path4"
+     sodipodi:nodetypes="cccssccc" />
+  <path
+     d="m 14,12 c 0,2.7614 6.7157,5 15,5 8.2843,0 15,-2.2386 15,-5 C 44,9.23858 37.2843,7 29,7 20.7157,7 14,9.23858 14,12 Z"
+     fill="none"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path6" />
+  <path
+     d="m 44,28 c 0,2.7614 -6.7157,5 -15,5 -1.807,0 -3.5393,-0.1065 -5.1436,-0.3017"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path8" />
+  <path
+     d="m 44,20 c 0,2.7614 -6.7157,5 -15,5 -2.7563,0 -5.339,-0.2478 -7.5585,-0.6802"
+     stroke="#ffffff"
+     stroke-width="3"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     id="path10" />
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/newlook/filesystem/cfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/newlook/filesystem/cfile-vcs-conflict.svg
index 10964c61..c2b7cb0f 100644
--- a/RedPandaIDE/resources/iconsets/newlook/filesystem/cfile-vcs-conflict.svg
+++ b/RedPandaIDE/resources/iconsets/newlook/filesystem/cfile-vcs-conflict.svg
@@ -25,8 +25,8 @@
      inkscape:document-units="px"
      showgrid="false"
      inkscape:zoom="2.8934905"
-     inkscape:cx="160.70556"
-     inkscape:cy="10.886505"
+     inkscape:cx="87.092043"
+     inkscape:cy="132.88449"
      inkscape:window-width="1920"
      inkscape:window-height="1001"
      inkscape:window-x="-9"
@@ -115,17 +115,31 @@
          style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:sans-serif;-inkscape-font-specification:'sans-serif Bold';stroke-width:0.264583"
          x="-8.4125614"
          y="18.471058" /></text>
-    <ellipse
-       style="fill:#e6b700;fill-opacity:0.72529602;stroke-width:0.291041;stroke-linecap:round"
-       id="path857"
-       cx="6.7928686"
-       cy="19.202585"
-       rx="6.638608"
-       ry="7.0409479" />
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.2794;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 4.5275489,14.976951 -1.7122358,1.712236 2.239077,2.239077 -2.239077,2.239077 1.8439458,1.843945 2.239077,-2.239077 2.1073666,2.107367 1.7122355,-1.712236 -2.1073664,-2.107366 2.2390774,-2.239077 -1.8439462,-1.843946 -2.239077,2.239077 z"
-       id="path1359"
-       sodipodi:nodetypes="ccccccccccccc" />
+    <g
+       id="g9291">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
   </g>
 </svg>
diff --git a/RedPandaIDE/resources/iconsets/newlook/filesystem/cppfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/newlook/filesystem/cppfile-vcs-conflict.svg
new file mode 100644
index 00000000..59466849
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/newlook/filesystem/cppfile-vcs-conflict.svg
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="cppfile-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="8.1840272"
+     inkscape:cx="24.682225"
+     inkscape:cy="83.394151"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1420">
+      <stop
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0"
+         id="stop1416" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop1418" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient1422"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1755"
+       transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
+      <path
+         id="rect848-1"
+         style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
+         transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+         d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+         id="path1641" />
+    </g>
+    <g
+       id="g844"
+       transform="translate(-0.49020728,7.1938e-4)">
+      <path
+         id="text2970"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#2c4dff;fill-opacity:1;stroke-width:0.264583"
+         d="m 14.167102,15.28627 c -1.887338,0.06652 -3.603074,1.494063 -3.936045,3.365551 -0.4630867,2.059085 0.04847,4.673412 2.097612,5.688699 1.792494,0.883972 3.920067,0.474864 5.615777,-0.439016 0,-0.716797 0,-1.433594 0,-2.150391 -0.618766,-0.132261 -1.068817,0.159596 -1.511718,0.554688 -1.184225,0.780728 -3.207312,0.799329 -3.851563,-0.685547 -0.52169,-1.285789 -0.483042,-3.088664 0.697266,-4.001953 1.247706,-0.776543 2.871086,-0.204218 3.873047,0.726562 0.794598,0.220511 0.900162,-0.248015 0.792968,-0.929297 -0.07567,-0.539614 0.278173,-1.350029 -0.481253,-1.457679 -1.015934,-0.506562 -2.16004,-0.763802 -3.296091,-0.671617 z" />
+      <text
+         xml:space="preserve"
+         style="font-size:10.0971px;line-height:1.25;font-family:sans-serif;stroke-width:0.23665"
+         x="18.716648"
+         y="21.428247"
+         id="text11617"
+         transform="scale(0.89442719,1.118034)"><tspan
+           sodipodi:role="line"
+           id="tspan11615"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.0971px;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#3f53ff;fill-opacity:1;stroke-width:0.23665"
+           x="18.716648"
+           y="21.428247">+</tspan></text>
+      <text
+         xml:space="preserve"
+         style="font-size:10.0971px;line-height:1.25;font-family:sans-serif;stroke-width:0.23665"
+         x="24.291918"
+         y="21.393011"
+         id="text11617-3"
+         transform="scale(0.89442719,1.118034)"><tspan
+           sodipodi:role="line"
+           id="tspan11615-1"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:10.0971px;font-family:'Fira Code';-inkscape-font-specification:'Fira Code Bold';fill:#3f53ff;fill-opacity:1;stroke-width:0.23665"
+           x="24.291918"
+           y="21.393011">+</tspan></text>
+    </g>
+    <g
+       id="g9291"
+       transform="translate(-0.18880569,-0.00512481)">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/newlook/filesystem/file-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/newlook/filesystem/file-vcs-conflict.svg
new file mode 100644
index 00000000..64acd7b1
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/newlook/filesystem/file-vcs-conflict.svg
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="file-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="8.1840272"
+     inkscape:cx="47.042854"
+     inkscape:cy="64.699199"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1420">
+      <stop
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0"
+         id="stop1416" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop1418" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient1422"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1755"
+       transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
+      <path
+         id="rect848-1"
+         style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
+         transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+         d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+         id="path1641" />
+    </g>
+    <g
+       id="g9291"
+       transform="translate(-0.05702849,0.02928454)">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/newlook/filesystem/folder-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/newlook/filesystem/folder-vcs-conflict.svg
new file mode 100644
index 00000000..85c4f34f
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/newlook/filesystem/folder-vcs-conflict.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="folder-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="0.5115017"
+     inkscape:cx="-658.84434"
+     inkscape:cy="-333.33222"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g929">
+      <path
+         id="rect934"
+         style="fill:#fcbc4c;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 23.25086,19.940626 0.02129,-5.348279 c -0.02157,-1.176532 -1.20298,-1.844222 -2.462226,-1.92922 l -0.0078,-10.8812511 c 0.06287,-0.93528196 0.02037,-0.88955496 -0.860969,-0.88955496 H 6.4328923 V 21.6662 L 20.623933,21.62608 c 1.6677,-0.09916 2.57977,-0.603319 2.626927,-1.685458 z"
+         sodipodi:nodetypes="ccccccccc" />
+      <path
+         style="fill:#fdd99b;fill-opacity:1;stroke:#000000;stroke-width:0.200279;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="M 6.4243333,0.89348134 V 21.667422 l 6.1295627,3.630798 c 0.501856,0.355154 0.457316,0.283463 0.458431,-0.602532 l 0.02342,-18.6159783 c 0.04803,-0.8264309 -0.02852,-0.8256775 -0.44161,-1.0993086 z"
+         id="path6014"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+    <g
+       id="g9291"
+       transform="translate(0.06377054,0.06789732)">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/newlook/filesystem/hfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/newlook/filesystem/hfile-vcs-conflict.svg
new file mode 100644
index 00000000..c3b19b4e
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/newlook/filesystem/hfile-vcs-conflict.svg
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="hfile-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="11.573962"
+     inkscape:cx="28.425875"
+     inkscape:cy="69.941476"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1420">
+      <stop
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0"
+         id="stop1416" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop1418" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient1422"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g1755"
+       transform="matrix(1.1063575,0,0,1.1063575,-1.4148159,-1.417466)">
+      <path
+         id="rect848-1"
+         style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
+         transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+         d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+         id="path1641" />
+    </g>
+    <path
+       id="text18521"
+       style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#ff2c2c;fill-opacity:1;stroke-width:0.327221"
+       d="m 13.697559,13.152902 c 0,3.69206 0,7.384117 0,11.076174 0.86394,0 1.72787,0 2.5918,0 0.003,-1.897806 -0.0106,-3.795701 0.0195,-5.693359 0.7188,-0.392097 1.9834,-0.700116 2.36133,0.289062 0.17729,1.785387 0.0606,3.605548 0.0898,5.404297 0.86719,0 1.73437,0 2.60156,0 -0.0652,-2.23573 0.20291,-4.506102 -0.18625,-6.716994 -0.48144,-1.572364 -2.49433,-2.11523 -3.85981,-1.360524 -0.55062,0.282215 -1.28025,0.861239 -1.0262,-0.173263 0,-0.990625 0,-1.981251 0,-2.971877 -0.86394,0 -1.72787,0 -2.5918,0 v 0.1 z" />
+    <g
+       id="g9291"
+       transform="translate(-0.16387349,0.00586638)">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/resources/iconsets/newlook/filesystem/projectfile-vcs-conflict.svg b/RedPandaIDE/resources/iconsets/newlook/filesystem/projectfile-vcs-conflict.svg
new file mode 100644
index 00000000..cf32579f
--- /dev/null
+++ b/RedPandaIDE/resources/iconsets/newlook/filesystem/projectfile-vcs-conflict.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="100"
+   height="100"
+   viewBox="0 0 26.458333 26.458333"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)"
+   sodipodi:docname="projectfile-vcs-conflict.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="px"
+     showgrid="false"
+     inkscape:zoom="16.368054"
+     inkscape:cx="28.164618"
+     inkscape:cy="85.379726"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     inkscape:window-x="-9"
+     inkscape:window-y="-9"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1"
+     units="px"
+     width="100px" />
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient3056"
+       inkscape:swatch="gradient">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop826" />
+      <stop
+         style="stop-color:#53e900;stop-opacity:1"
+         offset="1"
+         id="stop828" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3056-2">
+      <stop
+         style="stop-color:#45c200;stop-opacity:1"
+         offset="0"
+         id="stop3052" />
+      <stop
+         style="stop-color:#5fff07;stop-opacity:1"
+         offset="1"
+         id="stop3054" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient1422"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient1420">
+      <stop
+         style="stop-color:#e0e0e0;stop-opacity:1;"
+         offset="0"
+         id="stop1416" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop1418" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient953"
+       gradientUnits="userSpaceOnUse"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient1420"
+       id="linearGradient955"
+       gradientUnits="userSpaceOnUse"
+       x1="7.8442378"
+       y1="11.269956"
+       x2="1.9260681"
+       y2="11.269956" />
+  </defs>
+  <g
+     inkscape:label="图层 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <g
+       id="g851"
+       transform="translate(0.26700126,-0.33111518)">
+      <g
+         id="g1755"
+         transform="matrix(0.89614957,0,0,0.89614957,5.9992311,-0.90196801)">
+        <path
+           id="rect848-1"
+           style="fill:url(#linearGradient953);stroke:#000000;stroke-width:0.721591"
+           transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+           d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+           id="path1641" />
+      </g>
+      <g
+         id="g1755-7"
+         transform="matrix(0.89614957,0,0,0.89614957,1.8865805,1.8185308)">
+        <path
+           id="rect848-1-2"
+           style="fill:url(#linearGradient955);stroke:#000000;stroke-width:0.721591"
+           transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+           d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+           id="path1641-1" />
+      </g>
+      <g
+         id="g1755-2"
+         transform="matrix(0.89614957,0,0,0.89614957,-2.9140658,3.9216711)">
+        <path
+           id="rect848-1-28"
+           style="fill:url(#linearGradient1422);stroke:#000000;stroke-width:0.721591"
+           transform="matrix(1.1,0,0,1.1,2.6932117,0.93042432)"
+           d="M 1.8840514,1.3039001 H 12.125786 l 5.237068,5.830555 0.04157,14.1015569 H 1.8840514 Z"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           style="fill:none;stroke:#000000;stroke-width:0.79375;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 16.031576,2.3647144 -0.02942,6.3678902 5.790196,0.04572"
+           id="path1641-9" />
+      </g>
+    </g>
+    <g
+       id="g9291"
+       transform="translate(-0.02314843,0.02817845)">
+      <path
+         sodipodi:type="star"
+         style="fill:#ffc04e;fill-opacity:0.75;stroke:none;stroke-width:3;stroke-linecap:round"
+         id="path8328"
+         inkscape:flatsided="true"
+         sodipodi:sides="3"
+         sodipodi:cx="22.118614"
+         sodipodi:cy="41.472401"
+         sodipodi:r1="20.71603"
+         sodipodi:r2="10.358015"
+         sodipodi:arg1="-0.48603193"
+         sodipodi:arg2="0.56116562"
+         inkscape:rounded="0.1"
+         inkscape:randomized="0"
+         transform="matrix(0.37835416,0,0,-0.37835416,-1.3689609,37.07614)"
+         inkscape:transform-center-x="0.40477197"
+         inkscape:transform-center-y="5.0342776"
+         d="m 40.435591,31.795507 c 1.676087,3.172594 -15.50944,30.51307 -19.09503,30.378308 C 17.754971,62.039052 2.6701873,33.485711 4.5796903,30.44788 6.4891933,27.410049 38.759504,28.622914 40.435591,31.795507 Z" />
+      <path
+         id="text4491"
+         style="font-size:11.2889px;line-height:1.25;font-family:sans-serif;fill:#000000;fill-opacity:1;stroke-width:0.276489"
+         d="m 5.6926071,16.153074 c 0.046039,2.308393 0.093965,4.196368 0.138789,6.504784 H 7.8195087 C 7.8740097,20.161742 7.939172,18.085889 7.9928318,15.589754 H 5.682402 c 0.00341,0.187774 0.0068,0.375547 0.01021,0.56332 z M 6.7988376,23.17825 C 5.6500342,23.153243 5.0939453,24.806865 6.0509351,25.461124 6.9146531,26.215007 8.3970948,25.330501 8.1193747,24.208963 7.9937068,23.610139 7.4164963,23.140069 6.7988376,23.17825 Z"
+         sodipodi:nodetypes="ccccccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/RedPandaIDE/vcs/gitbranchdialog.cpp b/RedPandaIDE/vcs/gitbranchdialog.cpp
index 6bf4cb38..d08a4aeb 100644
--- a/RedPandaIDE/vcs/gitbranchdialog.cpp
+++ b/RedPandaIDE/vcs/gitbranchdialog.cpp
@@ -41,18 +41,17 @@ void GitBranchDialog::on_btnCancel_clicked()
 
 void GitBranchDialog::on_btnOk_clicked()
 {
-    QString branch = ui->lstBranches->currentText();
-    QString text;
+    QString branch;
     if (ui->chkCreate->isChecked())
-        text = ui->txtNewBranch->text();
+        branch = ui->txtNewBranch->text();
     else
-        text = ui->lstBranches->currentText();
+        branch = ui->lstBranches->currentText();
     bool result = false;
     QString output;
-    if (!text.isEmpty()) {
+    if (!branch.isEmpty()) {
         result = mManager->switchToBranch(
                     mFolder,
-                    ui->txtNewBranch->text(),
+                    branch,
                     ui->chkCreate->isChecked(),
                     ui->chkForce->isChecked(),
                     ui->chkMerge->isChecked(),
diff --git a/RedPandaIDE/vcs/gitmanager.cpp b/RedPandaIDE/vcs/gitmanager.cpp
index 39955295..0738a5ed 100644
--- a/RedPandaIDE/vcs/gitmanager.cpp
+++ b/RedPandaIDE/vcs/gitmanager.cpp
@@ -150,6 +150,15 @@ QStringList GitManager::listChangedFiles(const QString &folder)
     return textToLines(runGit(folder,args));
 }
 
+QStringList GitManager::listConflicts(const QString &folder)
+{
+    QStringList args;
+    args.append("diff");
+    args.append("--name-only");
+    args.append("--diff-filter=U");
+    return textToLines(runGit(folder,args));
+}
+
 QStringList GitManager::listBranches(const QString &folder, int &current)
 {
     QStringList args;
@@ -165,6 +174,8 @@ QStringList GitManager::listBranches(const QString &folder, int &current)
             temp[i] = s.mid(1).trimmed();
         } else if (s.startsWith('+')) {
             temp[i] = s.mid(1).trimmed();
+        } else {
+            temp[i] = s.trimmed();
         }
     }
     return temp;
diff --git a/RedPandaIDE/vcs/gitmanager.h b/RedPandaIDE/vcs/gitmanager.h
index 59c93edf..915a87c3 100644
--- a/RedPandaIDE/vcs/gitmanager.h
+++ b/RedPandaIDE/vcs/gitmanager.h
@@ -36,6 +36,8 @@ public:
     QStringList listFiles(const QString& folder);
     QStringList listStagedFiles(const QString& folder);
     QStringList listChangedFiles(const QString& folder);
+    QStringList listConflicts(const QString& folder);
+
     QStringList listBranches(const QString& folder, int& current);
     bool switchToBranch(const QString& folder, const QString& branch, bool create,
                         bool force, bool merge, bool track, bool noTrack, bool forceCreation,
diff --git a/RedPandaIDE/vcs/gitmergedialog.cpp b/RedPandaIDE/vcs/gitmergedialog.cpp
index 4bf499dc..c92970e6 100644
--- a/RedPandaIDE/vcs/gitmergedialog.cpp
+++ b/RedPandaIDE/vcs/gitmergedialog.cpp
@@ -56,6 +56,9 @@ void GitMergeDialog::on_btnOk_clicked()
                     output,
                     ui->txtMergeMessage->toPlainText()
                         )) {
+        InfoMessageBox box;
+        box.setMessage(output);
+        box.exec();
         accept();
     } else {
         InfoMessageBox box;
diff --git a/RedPandaIDE/vcs/gitrepository.cpp b/RedPandaIDE/vcs/gitrepository.cpp
index f7e1f574..ecb902eb 100644
--- a/RedPandaIDE/vcs/gitrepository.cpp
+++ b/RedPandaIDE/vcs/gitrepository.cpp
@@ -92,11 +92,13 @@ void GitRepository::update()
         mFilesInRepositories.clear();
         mChangedFiles.clear();
         mStagedFiles.clear();
+        mConflicts.clear();
     } else {
         mInRepository = mManager->hasRepository(mRealFolder,mBranch);
         convertFilesListToSet(mManager->listFiles(mRealFolder),mFilesInRepositories);
         convertFilesListToSet(mManager->listChangedFiles(mRealFolder),mChangedFiles);
         convertFilesListToSet(mManager->listStagedFiles(mRealFolder),mStagedFiles);
+        convertFilesListToSet(mManager->listConflicts(mRealFolder),mConflicts);
 //        qDebug()<<"update"<<mRealFolder<<mBranch;
 //        qDebug()<<mFilesInRepositories;
 //        qDebug()<<mChangedFiles;
diff --git a/RedPandaIDE/vcs/gitrepository.h b/RedPandaIDE/vcs/gitrepository.h
index 9f894739..b1101c91 100644
--- a/RedPandaIDE/vcs/gitrepository.h
+++ b/RedPandaIDE/vcs/gitrepository.h
@@ -44,6 +44,15 @@ public:
     bool hasChangedFiles() {
         return !mChangedFiles.isEmpty();
     }
+    bool isFileConflicting(const QFileInfo& fileInfo) {
+        return isFileConflicting(fileInfo.absoluteFilePath());
+    }
+    bool isFileConflicting(const QString& filePath) {
+        return mConflicts.contains(filePath);
+    }
+    bool hasConflicts(){
+        return !mConflicts.isEmpty();
+    }
 
     void add(const QString& path);
     void remove(const QString& path);
@@ -72,6 +81,7 @@ private:
     QSet<QString> mFilesInRepositories;
     QSet<QString> mChangedFiles;
     QSet<QString> mStagedFiles;
+    QSet<QString> mConflicts;
 private:
     void convertFilesListToSet(const QStringList& filesList,QSet<QString>& set);
 };