Merge pull request github#5254 from tamasvajk/feature/fix-merge

C#: Fix merge conflict (with + refactoring)

Author: tamasvajk

csharp/extractor/Semmle.Extraction.CSharp/Entities/Expressions/WithExpression.cs

@@ -12,9 +12,9 @@ private WithExpression(ExpressionNodeInfo info) : base(info.SetKind(ExprKind.WIT
 
         protected override void PopulateExpression(TextWriter trapFile)
         {
-            Create(cx, Syntax.Expression, this, 0);
+            Create(Context, Syntax.Expression, this, 0);
 
-            ObjectInitializer.Create(new ExpressionNodeInfo(cx, Syntax.Initializer, this, 1).SetType(Type));
+            ObjectInitializer.Create(new ExpressionNodeInfo(Context, Syntax.Initializer, this, 1).SetType(Type));
         }
     }
 }