Resolve merge conflicts

src/Compilers/CSharp/Portable/Errors/MessageID.cs

@@ -475,13 +475,8 @@ internal static LanguageVersion RequiredVersion(this MessageID feature)
                 // PREFER reporting diagnostics in binding when diagnostics do not affect the shape of the syntax tree
 
                 // C# preview features.
-<<<<<<< HEAD
-                case MessageID.IDS_FeatureRefStructInterfaces:
-                case MessageID.IDS_FeatureFieldAndValueKeywords:
-                case MessageID.IDS_FeatureExtensions:
-=======
                 case MessageID.IDS_FeatureFieldKeyword:
->>>>>>> origin/main
+                case MessageID.IDS_FeatureExtensions:
                     return LanguageVersion.Preview;
 
                 // C# 13.0 features.

src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter_Call.cs

@@ -397,12 +397,8 @@ BoundExpression visitArgumentsAndFinishRewrite(BoundCall node, BoundExpression?
                     ref temps,
                     invokedAsExtensionMethod);
 
-<<<<<<< HEAD
                 // PROTOTYPE(roles): Disable interception for extensions?
-                InterceptCallAndAdjustArguments(ref method, ref rewrittenReceiver, ref rewrittenArguments, ref argRefKindsOpt, invokedAsExtensionMethod, node.InterceptableNameSyntax);
-=======
                 InterceptCallAndAdjustArguments(ref method, ref rewrittenReceiver, ref rewrittenArguments, ref argRefKindsOpt, ref temps, invokedAsExtensionMethod, node.InterceptableNameSyntax);
->>>>>>> origin/main
 
                 if (Instrument)
                 {

src/Compilers/CSharp/Portable/Syntax/InternalSyntax/TypeDeclarationSyntax.cs

@@ -153,4 +153,38 @@ public override TypeDeclarationSyntax UpdateCore(
                 semicolonToken);
         }
     }
+
+    internal partial class ExtensionDeclarationSyntax
+    {
+        public override TypeDeclarationSyntax UpdateCore(
+            CoreSyntax.SyntaxList<AttributeListSyntax> attributeLists,
+            CoreSyntax.SyntaxList<SyntaxToken> modifiers,
+            SyntaxToken keyword,
+            SyntaxToken identifier,
+            TypeParameterListSyntax typeParameterList,
+            ParameterListSyntax parameterList,
+            BaseListSyntax baseList,
+            CoreSyntax.SyntaxList<TypeParameterConstraintClauseSyntax> constraintClauses,
+            SyntaxToken openBraceToken,
+            CoreSyntax.SyntaxList<MemberDeclarationSyntax> members,
+            SyntaxToken closeBraceToken,
+            SyntaxToken semicolonToken)
+        {
+            return this.Update(
+                attributeLists,
+                modifiers,
+                this.ImplicitOrExplicitKeyword,
+                keyword,
+                identifier,
+                typeParameterList,
+                parameterList,
+                this.ForUnderlyingType,
+                baseList,
+                constraintClauses,
+                openBraceToken,
+                members,
+                closeBraceToken,
+                semicolonToken);
+        }
+    }
 }

src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenTupleTest.cs

@@ -27918,13 +27918,8 @@ public ValueTuple(T1 item1)
         }
     }
 }";
-<<<<<<< HEAD
-            var comp = CreateCompilation(source, targetFramework: TargetFramework.Mscorlib45);
-            var type = (SourceNonExtensionNamedTypeSymbol)comp.GetMember("System.ValueTuple");
-=======
             var comp = CreateCompilation(source, targetFramework: TargetFramework.Mscorlib461);
-            var type = (SourceNamedTypeSymbol)comp.GetMember("System.ValueTuple");
->>>>>>> origin/main
+            var type = (SourceNonExtensionNamedTypeSymbol)comp.GetMember("System.ValueTuple");
             var field = (SourceMemberFieldSymbolFromDeclarator)type.GetMember("Item1");
             var underlyingField = field.TupleUnderlyingField;