merge conflict fix

Author: jeanPerier

mlir/include/mlir/Interfaces/CallInterfaces.td

@@ -73,7 +73,7 @@ def CallOpInterface : OpInterface<"CallOpInterface"> {
   }];
   let cppNamespace = "::mlir";
 
-  let methods = !listconcat(ArgumentAttributesMethods.methods, [
+  let methods = [
     InterfaceMethod<[{
         Returns the callee of this call-like operation. A `callee` is either a
         reference to a symbol, via SymbolRefAttr, or a reference to a defined
@@ -138,7 +138,7 @@ def CallableOpInterface : OpInterface<"CallableOpInterface"> {
   }];
   let cppNamespace = "::mlir";
 
-  let methods = !listconcat(ArgumentAttributesMethods.methods, [
+  let methods = [
     InterfaceMethod<[{
         Returns the region on the current operation that is callable. This may
         return null in the case of an external callable object, e.g. an external