resolve merge conflict

Author: Jami Cogswell

java/ql/lib/semmle/code/java/Expr.qll

@@ -1316,6 +1316,19 @@ class ClassInstanceExpr extends Expr, ConstructorCall, @classinstancexpr {
     result = this.getAnArgument()
   }
 
+  // ! remove below predicate after experimentation
+  /**
+   * Gets the argument provided to the constructor of this class instance creation expression
+   * of the specified Type.
+   */
+  Expr getArgumentByType(Type type) {
+    exists(Argument arg |
+      arg = this.getAnArgument() and
+      arg.getType() = type and
+      result = arg
+    )
+  }
+
   /**
    * Gets a type argument provided to the constructor of this class instance creation expression.
    *