Remove unexpected changes on merge and some commented out code

Author: tommy9

Rubberduck.Core/Properties/Settings.Designer.cs

@@ -92,17 +92,4 @@
       <Version>2.0.20525</Version>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Update="Properties\Settings.Designer.cs">
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-  </ItemGroup>
 </Project>

Rubberduck.Core/Rubberduck.Core.csproj

@@ -79,40 +79,6 @@ public static bool Overlaps(this Selection thisSelection, Selection selection)
                 return true;
 
             return false;
-
-            //if (thisSelection.StartLine == selection.EndLine)
-            //{
-            //    if (thisSelection.StartColumn <= selection.EndColumn)
-            //        return true;
-            //}
-            //else if(thisSelection.EndLine == selection.EndLine)
-            //{
-            //    if (thisSelection.EndColumn <= selection.EndColumn)
-            //        return true;
-            //}
-
-            //if (thisSelection.EndLine == selection.StartLine)
-            //{
-            //    if (thisSelection.EndColumn >= selection.StartColumn)
-            //        return true;
-            //}
-            //else if(thisSelection.StartLine == selection.StartLine)
-            //{
-            //    if (thisSelection.StartColumn <= selection.StartColumn)
-            //        return true;
-            //}
-
-            //if (thisSelection.StartLine < selection.EndLine && thisSelection.EndLine > selection.StartLine)
-            //{
-            //    return true;
-            //}
-
-            //if (thisSelection.EndLine > selection.StartLine && thisSelection.StartLine < selection.EndLine)
-            //{
-            //    return true;
-            //}
-
-            //return false; 
         }
     }
 }