diff --git a/src/Notepad3.vcxproj b/src/Notepad3.vcxproj
index c397ed7c7..c17e8c6bf 100644
--- a/src/Notepad3.vcxproj
+++ b/src/Notepad3.vcxproj
@@ -110,6 +110,10 @@
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
       <LanguageStandard>stdcpp17</LanguageStandard>
+<<<<<<< HEAD
+      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
+=======
+>>>>>>> Notepad3_upstream_Rizone/master
     </ClCompile>
     <Link>
       <AdditionalDependencies>msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -163,6 +167,10 @@
       <StringPooling>true</StringPooling>
       <FloatingPointModel>Fast</FloatingPointModel>
       <LanguageStandard>stdcpp17</LanguageStandard>
+<<<<<<< HEAD
+      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
+=======
+>>>>>>> Notepad3_upstream_Rizone/master
     </ClCompile>
     <Link>
       <AdditionalDependencies>msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -214,6 +222,10 @@
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
       <LanguageStandard>stdcpp17</LanguageStandard>
+<<<<<<< HEAD
+      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
+=======
+>>>>>>> Notepad3_upstream_Rizone/master
     </ClCompile>
     <Link>
       <AdditionalDependencies>msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -267,6 +279,10 @@
       <StringPooling>true</StringPooling>
       <FloatingPointModel>Fast</FloatingPointModel>
       <LanguageStandard>stdcpp17</LanguageStandard>
+<<<<<<< HEAD
+      <EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
+=======
+>>>>>>> Notepad3_upstream_Rizone/master
     </ClCompile>
     <Link>
       <AdditionalDependencies>msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>