Resolve conflicts correctly

Author: Hosch250

RetailCoder.VBE/Rubberduck.csproj

@@ -579,6 +579,7 @@
     <Compile Include="Navigation\CodeExplorer\CodeExplorerMemberViewModel.cs" />
     <Compile Include="Navigation\CodeExplorer\CodeExplorerProjectViewModel.cs" />
     <Compile Include="Navigation\CodeExplorer\CodeExplorerViewModel.cs" />
+    <Compile Include="UI\HotkeyDisplayConverter.cs" />
     <Compile Include="UI\Inspections\InspectionDescriptionConverter.cs" />
     <Compile Include="UI\Inspections\InspectionImageSourceConverter.cs" />
     <Compile Include="UI\Inspections\InspectionResultsControl.xaml.cs">