diff --git a/src/AutoMerge/AutoMerge.csproj b/src/AutoMerge/AutoMerge.csproj
index 385825e..5848df0 100644
--- a/src/AutoMerge/AutoMerge.csproj
+++ b/src/AutoMerge/AutoMerge.csproj
@@ -1,260 +1,268 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
-  <PropertyGroup>
-    <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
-    <StartAction>Program</StartAction>
-    <StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
-    <StartArguments>/rootsuffix Exp</StartArguments>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{726ED85E-2274-4D95-B822-B2CFE2CE44B9}</ProjectGuid>
-    <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>AutoMerge</RootNamespace>
-    <AssemblyName>AutoMerge</AssemblyName>
-    <SignAssembly>True</SignAssembly>
-    <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
-    <TargetFrameworkVersion Condition="'$(VisualStudioVersion)' == '17.0'">v4.8</TargetFrameworkVersion>
-    <TargetFrameworkVersion Condition="'$(VisualStudioVersion)' == '16.0'">v4.7.2</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.Composition" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Design" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="Microsoft.TeamFoundation.Client">
-      <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.Client.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.TeamFoundation.Common">
-      <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.Common.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.TeamFoundation.Controls">
-      <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.Controls.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.TeamFoundation.VersionControl.Client">
-      <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.VersionControl.Client.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.TeamFoundation.VersionControl.Common">
-      <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.VersionControl.Common.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="Microsoft.TeamFoundation.WorkItemTracking.Client">
-      <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.WorkItemTracking.Client.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
-    <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(VisualStudioVersion).*" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.VisualStudio.SDK" Version="$(VisualStudioVersion).*" ExcludeAssets="runtime" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AutoMergeNavigationItem.cs" />
-    <Compile Include="AutoMergePage.cs" />
-    <Compile Include="Base\TeamExplorerNavigationItemBase.cs" />
-    <Compile Include="Base\TeamExplorerBaseNavigationLink.cs" />
-    <Compile Include="Base\TeamExplorerPageBase.cs" />
-    <Compile Include="Base\TeamExplorerSectionBase.cs" />
-    <Compile Include="Base\TeamExplorerSectionViewModelBase.cs" />
-    <Compile Include="Behaviours\GridViewColumnResize.cs" />
-    <Compile Include="Behaviours\ScrollDeligateBehavior.cs" />
-    <Compile Include="Branches\BranchesSection.cs" />
-    <Compile Include="Branches\BranchesViewModel.cs" />
-    <Compile Include="Branches\BranchesView.xaml.cs">
-      <DependentUpon>BranchesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Branches\BranchesViewModelContext.cs" />
-    <Compile Include="Branches\BranchFactory.cs" />
-    <Compile Include="Branches\BranchValidationResult.cs" />
-    <Compile Include="Branches\BranchValidator.cs" />
-    <Compile Include="Branches\CheckInResult.cs" />
-    <Compile Include="Branches\EscapeMnemonicConverter.cs" />
-    <Compile Include="Branches\FileMergeInfo.cs" />
-    <Compile Include="Branches\MergeInfoViewModel.cs" />
-    <Compile Include="Branches\MergeMode.cs" />
-    <Compile Include="Branches\MergeModeToStringConverter.cs" />
-    <Compile Include="Branches\MergeOption.cs" />
-    <Compile Include="Branches\MergeOptionToCheckedConverter.cs" />
-    <Compile Include="Branches\MergeOptionToStringConverter.cs" />
-    <Compile Include="Branches\MergeRelation.cs" />
-    <Compile Include="Branches\MergeResult.cs" />
-    <Compile Include="Branches\MergeResultModel.cs" />
-    <Compile Include="Branches\Notification.cs" />
-    <Compile Include="Branches\TrackMergeInfo.cs" />
-    <Compile Include="Commands\ShowAutoMergeWindow.cs" />
-    <Compile Include="CommentFormater.cs" />
-    <Compile Include="Configuration\CommentFormat.cs" />
-    <Compile Include="Configuration\ISettingProvider.cs" />
-    <Compile Include="Configuration\JsonParser.cs" />
-    <Compile Include="Configuration\FileSettingProvider.cs" />
-    <Compile Include="Configuration\Settings.cs" />
-    <Compile Include="Controls\SplitButton.xaml.cs">
-      <DependentUpon>SplitButton.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Events\BranchSelectedChangedEvent.cs" />
-    <Compile Include="Events\EventAggregatorFactory.cs" />
-    <Compile Include="Events\MergeCompleteEvent.cs" />
-    <Compile Include="Events\SelectChangesetEvent.cs" />
-    <Compile Include="Guids.cs" />
-    <Compile Include="Helpers\BranchHelper.cs" />
-    <Compile Include="Helpers\EnumerableExtensions.cs" />
-    <Compile Include="Helpers\VersionControlNavigationHelper.cs" />
-    <Compile Include="Helpers\WorkspaceHelper.cs" />
-    <Compile Include="Prism\BindableBase.cs" />
-    <Compile Include="Prism\Command\DelegateCommand.cs" />
-    <Compile Include="Prism\Command\DelegateCommandBase .cs" />
-    <Compile Include="Prism\Command\IActiveAware.cs" />
-    <Compile Include="Prism\Command\WeakEventHandlerManager.cs" />
-    <Compile Include="Prism\Events\BackgroundEventSubscription.cs" />
-    <Compile Include="Prism\Events\DelegateReference.cs" />
-    <Compile Include="Prism\Events\DispatcherEventSubscription.cs" />
-    <Compile Include="Prism\Events\EventAggregator.cs" />
-    <Compile Include="Prism\Events\EventBase.cs" />
-    <Compile Include="Prism\Events\EventSubscription.cs" />
-    <Compile Include="Prism\Events\IDelegateReference.cs" />
-    <Compile Include="Prism\Events\IEventAggregator.cs" />
-    <Compile Include="Prism\Events\IEventSubscription.cs" />
-    <Compile Include="Prism\Events\PubSubEvent.cs" />
-    <Compile Include="Prism\Events\SubscriptionToken.cs" />
-    <Compile Include="Prism\Events\ThreadOption.cs" />
-    <Compile Include="Prism\PropertySupport.cs" />
-    <Compile Include="RecentChangesets\ChangesetByIdChangesetProvider.cs" />
-    <Compile Include="RecentChangesets\ChangesetCommentConverter.cs" />
-    <Compile Include="RecentChangesets\ChangesetProviderBase.cs" />
-    <Compile Include="RecentChangesets\ChangesetViewModel.cs" />
-    <Compile Include="RecentChangesets\IChangesetProvider.cs" />
-    <Compile Include="RecentChangesets\MyChangesetChangesetProvider.cs" />
-    <Compile Include="RecentChangesets\RecentChangesetFocusableControlNames.cs" />
-    <Compile Include="RecentChangesets\RecentChangesetsSection.cs" />
-    <Compile Include="RecentChangesets\RecentChangesetsView.xaml.cs">
-      <DependentUpon>RecentChangesetsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="RecentChangesets\RecentChangesetsViewModel.cs" />
-    <Compile Include="RecentChangesets\RecentChangesetsViewModelContext.cs" />
-    <Compile Include="Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="AutoMergePackage.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\ChangesetService.cs" />
-    <Compile Include="Services\ILogger.cs" />
-    <Compile Include="Services\LoggerBase.cs" />
-    <Compile Include="Services\VsLogger.cs" />
-    <Compile Include="VersionControl\VersionControlProvider.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="VSPackage.resx">
-      <MergeWithCTO>true</MergeWithCTO>
-      <ManifestResourceName>VSPackage</ManifestResourceName>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <VSCTCompile Include="VSCommandTable.vsct">
-      <ResourceName>Menus.ctmenu</ResourceName>
-    </VSCTCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Key.snk" />
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\LICENSE.txt">
-      <Link>LICENSE.txt</Link>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="..\..\RELEASE_NOTES.md">
-      <Link>RELEASE_NOTES.md</Link>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="Resources\merge.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-    <Content Include="Resources\Package.ico" />
-    <Content Include="Resources\preview.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-      <IncludeInVSIX>true</IncludeInVSIX>
-    </Content>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="source.extension.vsixmanifest">
-      <SubType>Designer</SubType>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Branches\BranchesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\SplitButton.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="RecentChangesets\RecentChangesetsView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Styles\CommonStyles.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup />
-  <PropertyGroup>
-    <UseCodebase>true</UseCodebase>
-  </PropertyGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
-  <Target Name="BeforeBuild">
-    <Copy SourceFiles="source.vs$(VisualStudioVersion).extension.vsixmanifest" DestinationFiles="source.extension.vsixmanifest" />
-  </Target>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+    <PropertyGroup>
+        <MinimumVisualStudioVersion>$(VisualStudioVersion)</MinimumVisualStudioVersion>
+        <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
+        <LangVersion>latest</LangVersion>
+        <StartAction>Program</StartAction>
+        <StartProgram>$(DevEnvDir)\devenv.exe</StartProgram>
+        <StartArguments>/rootsuffix Exp</StartArguments>
+        <TargetFrameworkProfile />
+    </PropertyGroup>
+    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+    <PropertyGroup>
+        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+        <SchemaVersion>2.0</SchemaVersion>
+        <ProjectGuid>{726ED85E-2274-4D95-B822-B2CFE2CE44B9}</ProjectGuid>
+        <ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+        <OutputType>Library</OutputType>
+        <AppDesignerFolder>Properties</AppDesignerFolder>
+        <RootNamespace>AutoMerge</RootNamespace>
+        <AssemblyName>AutoMerge</AssemblyName>
+        <SignAssembly>True</SignAssembly>
+        <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
+        <TargetFrameworkVersion Condition="'$(VisualStudioVersion)' == '18.0'">v4.8</TargetFrameworkVersion>
+        <TargetFrameworkVersion Condition="'$(VisualStudioVersion)' == '17.0'">v4.8</TargetFrameworkVersion>
+        <TargetFrameworkVersion Condition="'$(VisualStudioVersion)' == '16.0'">v4.7.2</TargetFrameworkVersion>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+        <DebugSymbols>true</DebugSymbols>
+        <DebugType>full</DebugType>
+        <Optimize>false</Optimize>
+        <OutputPath>bin\Debug\</OutputPath>
+        <DefineConstants>DEBUG;TRACE</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+    </PropertyGroup>
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <DebugType>pdbonly</DebugType>
+        <Optimize>true</Optimize>
+        <OutputPath>bin\Release\</OutputPath>
+        <DefineConstants>TRACE</DefineConstants>
+        <ErrorReport>prompt</ErrorReport>
+        <WarningLevel>4</WarningLevel>
+        <RunCodeAnalysis>true</RunCodeAnalysis>
+        <CreateVsixContainer>True</CreateVsixContainer>
+        <DeployExtension>True</DeployExtension>
+        <CopyVsixExtensionFiles>True</CopyVsixExtensionFiles>
+    </PropertyGroup>
+    <ItemGroup>
+        <Reference Include="Microsoft.CSharp" />
+        <Reference Include="PresentationCore" />
+        <Reference Include="PresentationFramework" />
+        <Reference Include="System" />
+        <Reference Include="System.ComponentModel.Composition" />
+        <Reference Include="System.Core" />
+        <Reference Include="System.Data" />
+        <Reference Include="System.Design" />
+        <Reference Include="System.Drawing" />
+        <Reference Include="System.Web.Extensions" />
+        <Reference Include="System.Windows.Forms" />
+        <Reference Include="System.Xaml" />
+        <Reference Include="System.Xml" />
+        <Reference Include="WindowsBase" />
+        <Reference Include="Microsoft.TeamFoundation.Client">
+            <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.Client.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.TeamFoundation.Common">
+            <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.Common.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.TeamFoundation.Controls">
+            <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.Controls.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.TeamFoundation.VersionControl.Client">
+            <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.VersionControl.Client.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.TeamFoundation.VersionControl.Common">
+            <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.VersionControl.Common.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="Microsoft.TeamFoundation.WorkItemTracking.Client">
+            <HintPath>..\..\lib\$(VisualStudioVersion)\Microsoft.TeamFoundation.WorkItemTracking.Client.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="System.Windows.Interactivity.WPF" Version="2.0.20525" />
+        <!--<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(VisualStudioVersion).*" PrivateAssets="all" />-->
+        <PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.14.2120" PrivateAssets="all" />
+        <!--<PackageReference Include="Microsoft.VisualStudio.SDK" Version="$(VisualStudioVersion).*" ExcludeAssets="runtime" />-->
+        <PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.14.40265" ExcludeAssets="runtime" />
+    </ItemGroup>
+    <ItemGroup>
+        <Compile Include="AutoMergeNavigationItem.cs" />
+        <Compile Include="AutoMergePage.cs" />
+        <Compile Include="Base\TeamExplorerNavigationItemBase.cs" />
+        <Compile Include="Base\TeamExplorerBaseNavigationLink.cs" />
+        <Compile Include="Base\TeamExplorerPageBase.cs" />
+        <Compile Include="Base\TeamExplorerSectionBase.cs" />
+        <Compile Include="Base\TeamExplorerSectionViewModelBase.cs" />
+        <Compile Include="Behaviours\GridViewColumnResize.cs" />
+        <Compile Include="Behaviours\ScrollDeligateBehavior.cs" />
+        <Compile Include="Branches\BranchesSection.cs" />
+        <Compile Include="Branches\BranchesViewModel.cs" />
+        <Compile Include="Branches\BranchesView.xaml.cs">
+            <DependentUpon>BranchesView.xaml</DependentUpon>
+        </Compile>
+        <Compile Include="Branches\BranchesViewModelContext.cs" />
+        <Compile Include="Branches\BranchFactory.cs" />
+        <Compile Include="Branches\BranchValidationResult.cs" />
+        <Compile Include="Branches\BranchValidator.cs" />
+        <Compile Include="Branches\CheckInResult.cs" />
+        <Compile Include="Branches\EscapeMnemonicConverter.cs" />
+        <Compile Include="Branches\FileMergeInfo.cs" />
+        <Compile Include="Branches\MergeInfoViewModel.cs" />
+        <Compile Include="Branches\MergeMode.cs" />
+        <Compile Include="Branches\MergeModeToStringConverter.cs" />
+        <Compile Include="Branches\MergeOption.cs" />
+        <Compile Include="Branches\MergeOptionToCheckedConverter.cs" />
+        <Compile Include="Branches\MergeOptionToStringConverter.cs" />
+        <Compile Include="Branches\MergeRelation.cs" />
+        <Compile Include="Branches\MergeResult.cs" />
+        <Compile Include="Branches\MergeResultModel.cs" />
+        <Compile Include="Branches\Notification.cs" />
+        <Compile Include="Branches\TrackMergeInfo.cs" />
+        <Compile Include="Commands\ShowAutoMergeWindow.cs" />
+        <Compile Include="CommentFormater.cs" />
+        <Compile Include="Configuration\CommentFormat.cs" />
+        <Compile Include="Configuration\ISettingProvider.cs" />
+        <Compile Include="Configuration\JsonParser.cs" />
+        <Compile Include="Configuration\FileSettingProvider.cs" />
+        <Compile Include="Configuration\Settings.cs" />
+        <Compile Include="Controls\SplitButton.xaml.cs">
+            <DependentUpon>SplitButton.xaml</DependentUpon>
+        </Compile>
+        <Compile Include="Events\BranchSelectedChangedEvent.cs" />
+        <Compile Include="Events\EventAggregatorFactory.cs" />
+        <Compile Include="Events\MergeCompleteEvent.cs" />
+        <Compile Include="Events\SelectChangesetEvent.cs" />
+        <Compile Include="Guids.cs" />
+        <Compile Include="Helpers\BranchHelper.cs" />
+        <Compile Include="Helpers\EnumerableExtensions.cs" />
+        <Compile Include="Helpers\VersionControlNavigationHelper.cs" />
+        <Compile Include="Helpers\WorkspaceHelper.cs" />
+        <Compile Include="Prism\BindableBase.cs" />
+        <Compile Include="Prism\Command\DelegateCommand.cs" />
+        <Compile Include="Prism\Command\DelegateCommandBase .cs" />
+        <Compile Include="Prism\Command\IActiveAware.cs" />
+        <Compile Include="Prism\Command\WeakEventHandlerManager.cs" />
+        <Compile Include="Prism\Events\BackgroundEventSubscription.cs" />
+        <Compile Include="Prism\Events\DelegateReference.cs" />
+        <Compile Include="Prism\Events\DispatcherEventSubscription.cs" />
+        <Compile Include="Prism\Events\EventAggregator.cs" />
+        <Compile Include="Prism\Events\EventBase.cs" />
+        <Compile Include="Prism\Events\EventSubscription.cs" />
+        <Compile Include="Prism\Events\IDelegateReference.cs" />
+        <Compile Include="Prism\Events\IEventAggregator.cs" />
+        <Compile Include="Prism\Events\IEventSubscription.cs" />
+        <Compile Include="Prism\Events\PubSubEvent.cs" />
+        <Compile Include="Prism\Events\SubscriptionToken.cs" />
+        <Compile Include="Prism\Events\ThreadOption.cs" />
+        <Compile Include="Prism\PropertySupport.cs" />
+        <Compile Include="RecentChangesets\ChangesetByIdChangesetProvider.cs" />
+        <Compile Include="RecentChangesets\ChangesetCommentConverter.cs" />
+        <Compile Include="RecentChangesets\ChangesetProviderBase.cs" />
+        <Compile Include="RecentChangesets\ChangesetViewModel.cs" />
+        <Compile Include="RecentChangesets\IChangesetProvider.cs" />
+        <Compile Include="RecentChangesets\MyChangesetChangesetProvider.cs" />
+        <Compile Include="RecentChangesets\RecentChangesetFocusableControlNames.cs" />
+        <Compile Include="RecentChangesets\RecentChangesetsSection.cs" />
+        <Compile Include="RecentChangesets\RecentChangesetsView.xaml.cs">
+            <DependentUpon>RecentChangesetsView.xaml</DependentUpon>
+        </Compile>
+        <Compile Include="RecentChangesets\RecentChangesetsViewModel.cs" />
+        <Compile Include="RecentChangesets\RecentChangesetsViewModelContext.cs" />
+        <Compile Include="Resources.Designer.cs">
+            <AutoGen>True</AutoGen>
+            <DesignTime>True</DesignTime>
+            <DependentUpon>Resources.resx</DependentUpon>
+        </Compile>
+        <Compile Include="GlobalSuppressions.cs" />
+        <Compile Include="AutoMergePackage.cs" />
+        <Compile Include="Properties\AssemblyInfo.cs" />
+        <Compile Include="Services\ChangesetService.cs" />
+        <Compile Include="Services\ILogger.cs" />
+        <Compile Include="Services\LoggerBase.cs" />
+        <Compile Include="Services\VsLogger.cs" />
+        <Compile Include="VersionControl\VersionControlProvider.cs" />
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="Resources.resx">
+            <Generator>ResXFileCodeGenerator</Generator>
+            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+            <SubType>Designer</SubType>
+        </EmbeddedResource>
+        <EmbeddedResource Include="VSPackage.resx">
+            <MergeWithCTO>true</MergeWithCTO>
+            <ManifestResourceName>VSPackage</ManifestResourceName>
+        </EmbeddedResource>
+    </ItemGroup>
+    <ItemGroup>
+        <VSCTCompile Include="VSCommandTable.vsct">
+            <ResourceName>Menus.ctmenu</ResourceName>
+        </VSCTCompile>
+    </ItemGroup>
+    <ItemGroup>
+        <None Include="Key.snk" />
+    </ItemGroup>
+    <ItemGroup>
+        <Content Include="..\..\LICENSE.txt">
+            <Link>LICENSE.txt</Link>
+            <IncludeInVSIX>true</IncludeInVSIX>
+        </Content>
+        <Content Include="..\..\RELEASE_NOTES.md">
+            <Link>RELEASE_NOTES.md</Link>
+            <IncludeInVSIX>true</IncludeInVSIX>
+        </Content>
+        <Content Include="Resources\merge.png">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <IncludeInVSIX>true</IncludeInVSIX>
+        </Content>
+        <Content Include="Resources\Package.ico" />
+        <Content Include="Resources\preview.png">
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+            <IncludeInVSIX>true</IncludeInVSIX>
+        </Content>
+    </ItemGroup>
+    <ItemGroup>
+        <None Include="source.extension.vsixmanifest">
+            <SubType>Designer</SubType>
+        </None>
+    </ItemGroup>
+    <ItemGroup>
+        <Page Include="Branches\BranchesView.xaml">
+            <SubType>Designer</SubType>
+            <Generator>MSBuild:Compile</Generator>
+        </Page>
+        <Page Include="Controls\SplitButton.xaml">
+            <SubType>Designer</SubType>
+            <Generator>MSBuild:Compile</Generator>
+        </Page>
+        <Page Include="RecentChangesets\RecentChangesetsView.xaml">
+            <SubType>Designer</SubType>
+            <Generator>MSBuild:Compile</Generator>
+        </Page>
+        <Page Include="Styles\CommonStyles.xaml">
+            <SubType>Designer</SubType>
+            <Generator>MSBuild:Compile</Generator>
+        </Page>
+    </ItemGroup>
+    <ItemGroup />
+    <PropertyGroup>
+        <UseCodebase>true</UseCodebase>
+    </PropertyGroup>
+    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+    <!--<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />-->
+    <Import Project="C:\Program Files\Microsoft Visual Studio\18\Professional\MSBuild\Microsoft\VisualStudio\v18.0\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+    <Target Name="BeforeBuild">
+        <Copy SourceFiles="source.vs$(VisualStudioVersion).extension.vsixmanifest" DestinationFiles="source.extension.vsixmanifest" />
+    </Target>
+    <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>