Fix an incorrectly resolved merge conflict in Features.resx

src/Features/Core/Portable/FeaturesResources.Designer.cs

@@ -422,7 +422,7 @@ internal class FeaturesResources {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &gt;&gt;&gt;&gt;&gt;&gt;&gt; master.
+        ///   Looks up a localized string similar to Change &apos;{0}&apos; to &apos;{1}&apos;..
         /// </summary>
         internal static string ChangeTo {
             get {

src/Features/Core/Portable/FeaturesResources.resx

@@ -857,6 +857,5 @@ Do you want to continue?</value>
   </data>
   <data name="ChangeTo" xml:space="preserve">
     <value>Change '{0}' to '{1}'.</value>
->>>>>>> master
   </data>
 </root>
\ No newline at end of file