diff --git a/reallife-gamemode.csproj b/reallife-gamemode.csproj
index fef98cb7..95166b1a 100644
--- a/reallife-gamemode.csproj
+++ b/reallife-gamemode.csproj
@@ -12,7 +12,6 @@
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="2.1.2" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
   </ItemGroup>
-<<<<<<< HEAD
   <ItemGroup Condition="'$(ConfigurationName)' != 'ServerBuild'">
     <Reference Include="Bootstrapper">
       <HintPath>..\..\bridge\runtime\Bootstrapper.dll</HintPath>
@@ -22,12 +21,6 @@
     <Reference Include="Bootstrapper">
       <HintPath>..\Bootstrapper.dll</HintPath>
     </Reference>
-=======
-  <ItemGroup>
-    <Reference Include="Bootstrapper">
-      <HintPath>..\..\bridge\runtime\Bootstrapper.dll</HintPath>
-    </Reference>
->>>>>>> feature/duty-system
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(ConfigurationName)' == 'Debug'">
     <Exec Command="del &quot;..\..\client_packages\*&quot; /Q /S&#xD;&#xA;xcopy &quot;$(OutDir)*&quot; &quot;..\..\bridge\resources\reallife-gamemode&quot; /Y /Q&#xD;&#xA;del &quot;..\..\client_packages\*.*&quot; /Q&#xD;&#xA;xcopy &quot;..\..\reallife-gamemode\reallife-gamemode\Client\*&quot; &quot;..\..\client_packages\&quot; /S /Q /Y&#xD;&#xA;" />